fixing Locations