Fixed a bug where having to saves crashed the game