Autolocation fixed