Fixed bad geolocation problems