Fixed the map issue