--- a/train_cmd.c	Fri Jul 22 07:02:20 2005 +0000
+++ b/train_cmd.c	Fri Jul 22 08:40:19 2005 +0000
@@ -1801,6 +1801,7 @@
 			return false;
 
 	if (v->u.rail.force_proceed == 0) {
+		byte trackdir = GetVehicleTrackdir(v);
 		if (++v->load_unload_time_rem < 37) {
 			InvalidateWindowClasses(WC_TRAINS_LIST);
 			return true;
@@ -1808,8 +1809,7 @@
 
 		v->load_unload_time_rem = 0;
 
-		if (PBSIsPbsDepot(v->tile)) {
-			byte trackdir = GetVehicleTrackdir(v);
+		if (PBSIsPbsSegment(v->tile, trackdir)) {
 			NPFFindStationOrTileData fstd;
 			NPFFoundTargetData ftd;