Fixed fetch of currentLocation.