Hi folks. There is a patch to be tested over in the bug tracker for WordPress here: https://core.trac.www.ads-software.com/ticket/36534#comment:10
If you want to test and report findings back, that would be good. It would be a whole lot better than blind conjecture, here, to have the core fixed properly.