Fix for 2533132

This fix seems like it would have the least amount of possible side-effects, but I don't know for sure if it solves it completely.
Feel free to reject if you guys know of a better way :)