LOCATION fix