Hi Freeshark,
I went ahead and made a change on my internal build to try and address the issue. When the next update hits on Tuesday, hopefully it will be addressed. I'm not entirely sure if the change will work, as I can't get the issue to crop up for me, but if it doesn't then I can move towards another attempt at a fix. Sorry for the slow movement on it!
-- Ryan