Fix the location access