Fix map entries saving incorrectly when saving a new map twice