Fix ported to vehicles