More fix for location update