Have also struggled with this- would be great to see a fix