BUG 13592 fix

Seems to be running fine for me, you might want to do some testing of your own.