Fixed loading the maps