Only set currentLocationPoint once
Fixed merge