Pickup Location fixed