diff --git a/parse/journey-leg.js b/parse/journey-leg.js
index e6f2a2e4..0107a85f 100644
--- a/parse/journey-leg.js
+++ b/parse/journey-leg.js
@@ -17,19 +17,24 @@ const applyRemarks = (leg, hints, warnings, refs) => {
 			const toI = leg.stopovers.findIndex(s => s[locX] === ref.tLocX)
 			if (fromI < 0 || toI < 0) continue
 
-			for (let i = fromI; i <= toI; i++) {
-				const stopover = leg.stopovers[i]
-				if (!stopover) continue
-				if (Array.isArray(stopover.remarks)) {
-					stopover.remarks.push(remark)
-				} else {
-					stopover.remarks = [remark]
+			const wholeLeg = fromI === 0 && toI === (leg.stopovers.length - 1)
+			if (!wholeLeg) {
+				for (let i = fromI; i <= toI; i++) {
+					const stopover = leg.stopovers[i]
+					if (!stopover) continue
+					if (Array.isArray(stopover.remarks)) {
+						stopover.remarks.push(remark)
+					} else {
+						stopover.remarks = [remark]
+					}
 				}
+
+				continue
 			}
-		} else {
-			if (Array.isArray(leg.remarks)) leg.remarks.push(remark)
-			else leg.remarks = [remark]
 		}
+
+		if (Array.isArray(leg.remarks)) leg.remarks.push(remark)
+		else leg.remarks = [remark]
 		// todo: `ref.tagL`
 	}
 }