Vehicle models seems to have a high enough probability that it sometimes fails
And update all references including comments etc.