--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -313,8 +313,11 @@
 	}
 
 	/* Subtract half the front vehicle length of the train so we get the real
-	 * stop location of the train. */
-	return stop - (v->gcache.cached_veh_length + 1) / 2;
+	 * stop location of the train.
+	 * Actually, the center of all vehicles is half a normal vehicle's length
+	 * from the front of the vehicle, so even in case the vehicle is 1/8th
+	 * long, the center is still at 1/2 of VEHICLE_LENGTH. Basically FS#3569. */
+	return stop - VEHICLE_LENGTH / 2;
 }
 
 
@@ -3403,8 +3406,13 @@
 		default: break;
 	}
 
-	/* do not reverse when approaching red signal */
-	if (!signal && x + (v->gcache.cached_veh_length + 1) / 2 >= TILE_SIZE) {
+	/* Do not reverse when approaching red signal. Make sure the vehicle's front
+	 * does not cross the tile boundary when we do reverse, but as the vehicle's
+	 * location is based on their center, use half a vehicle's length as offset.
+	 * Actually, the center of all vehicles is half a normal vehicle's length
+	 * from the front of the vehicle, so even in case the vehicle is 1/8th
+	 * long, the center is still at 1/2 of VEHICLE_LENGTH. Basically FS#3569. */
+	if (!signal && x + VEHICLE_LENGTH / 2 >= TILE_SIZE) {
 		/* we are too near the tile end, reverse now */
 		v->cur_speed = 0;
 		ReverseTrainDirection(v);