Fixes on this have been merged and your situation should feel better once you update, let us know how it goes please.