Fixed up the map again