Tried to fix maps