Fixed the maps