diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -185,10 +185,8 @@ CommandCost CmdBuildTrainWaypoint(TileIn
 			/* First we update the destination for all vehicles that
 			 * have the old waypoint in their orders. */
 			Vehicle *v;
-			FOR_ALL_VEHICLES(v) {
-				if (v->type == VEH_TRAIN &&
-						v->First() == v &&
-						v->current_order.IsType(OT_GOTO_WAYPOINT) &&
+			FOR_ALL_TRAINS(v) {
+				if (v->First() == v && v->current_order.IsType(OT_GOTO_WAYPOINT) &&
 						v->dest_tile == wp->xy) {
 					v->dest_tile = tile;
 				}