More attempts to fix geolocation