Should fix issue #497 with the broken freezing the game.