--- a/src/vehicle.cpp	Sun May 27 01:59:07 2007 +0000
+++ b/src/vehicle.cpp	Sun May 27 05:32:37 2007 +0000
@@ -1794,7 +1794,7 @@
 	v = v_front;
 
 	do {
-		if (IsMultiheaded(v) && !IsTrainEngine(v)) {
+		if (v->type == VEH_TRAIN && IsMultiheaded(v) && !IsTrainEngine(v)) {
 			/* we build the rear ends of multiheaded trains with the front ones */
 			continue;
 		}