Fix for location selection