Fix for Geoloc