Vehicle construction bugfix

Fixes bug in issue #976.

I kinda forgot to pull upstream changes before commiting, hope that's not a problem.