finally fixed the maps