diff --git a/npf.c b/npf.c
index c6d01591ac..70e6ed9472 100644
--- a/npf.c
+++ b/npf.c
@@ -563,6 +563,8 @@ static void NPFFollowTrack(AyStar* aystar, OpenListNode* current)
 			} else {
 				dst_tile = INVALID_TILE; /* Road vehicle heading inwards: dead end */
 			}
+		} else {
+			dst_tile = AddTileIndexDiffCWrap(src_tile, TileIndexDiffCByDir(exitdir));
 		}
 	} else {
 		/* This a normal tile, a bridge, a tunnel exit, etc. */