Fixed updating location -yet again