--- a/src/order_gui.cpp	Fri Jun 01 11:41:02 2007 +0000
+++ b/src/order_gui.cpp	Fri Jun 01 12:03:10 2007 +0000
@@ -320,9 +320,9 @@
 {
 	if (u->type != v->type) return false;
 
-	if (u->type == VEH_TRAIN && !IsFrontEngine(u)) {
+	if (u->HasFront() && !u->IsPrimaryVehicle()) {
 		u = GetFirstVehicleInChain(u);
-		if (!IsFrontEngine(u)) return false;
+		if (!u->IsPrimaryVehicle()) return false;
 	}
 
 	// v is vehicle getting orders. Only copy/clone orders if vehicle doesn't have any orders yet