--- a/src/oldloader.cpp	Wed Jun 13 12:05:56 2007 +0000
+++ b/src/oldloader.cpp	Tue Jun 19 07:21:01 2007 +0000
@@ -22,7 +22,7 @@
 #include "signs.h"
 #include "debug.h"
 #include "depot.h"
-#include "network/network.h"
+#include "newgrf_config.h"
 #include "ai/ai.h"
 #include "date.h"
 #include "economy_new.h"
@@ -331,7 +331,11 @@
 		Vehicle *u;
 
 		/* We haven't used this bit for stations for ages */
-		if (v->type == VEH_ROAD) CLRBIT(v->u.road.state, RVS_IS_STOPPING);
+		if (v->type == VEH_ROAD &&
+				v->u.road.state != RVSB_IN_DEPOT &&
+				v->u.road.state != RVSB_WORMHOLE) {
+			CLRBIT(v->u.road.state, RVS_IS_STOPPING);
+		}
 
 		FOR_ALL_VEHICLES_FROM(u, v->index + 1) {
 			/* If a vehicle has the same orders, add the link to eachother