Use currentLocation consistently