I am suffering from this myself - exact same issue