Fix for post game crash