We have made improvements in this area recently, most recently in version 11.1.
Can I ask which version you're on? Does this still happen in version 11.1?