The best bug fix of them all
Hopefully this fixes it