Fixed geolocation handling