Bug fix for vehicle selection