workaround fix for vehicle lookup