Fix for pickup location