Fix support for single vehicle coming and going