This looks like a bug, therefore we made a few improvements.

Please test our latest beta from here, and let us know if  this fixes your issue.