Fixed updating location