Save game state bugfix