Fixed the location update