Fixed nil entity_map in new saves