Fixes #72 - hopefully: I think this was actually a general egde case for all vehicles

but rather hard to trigger in normal use, will see if I can replicate
the issue with this in place.