diff --git a/package.json b/package.json
index 39244a73..c2df49f1 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 		"tap-spec": "^4.1.1",
 		"tape": "^4.8.0",
 		"tape-promise": "^2.0.1",
-		"validate-fptf": "^1.0.1",
+		"validate-fptf": "^1.0.2",
 		"vbb-parse-line": "^0.2.5",
 		"vbb-stations-autocomplete": "^2.9.0"
 	},
diff --git a/parse/departure.js b/parse/departure.js
index c9d6c298..7946b5b4 100644
--- a/parse/departure.js
+++ b/parse/departure.js
@@ -21,6 +21,7 @@ const createParseDeparture = (profile, stations, lines, remarks) => {
 			remarks: d.remL ? d.remL.map(findRemark) : [],
 			trip: +d.jid.split('|')[1] // todo: this seems brittle
 		}
+		// todo: res.trip from rawLine.prodCtx.num
 
 		if (d.stbStop.dTimeR && d.stbStop.dTimeS) {
 			const realtime = profile.parseDateTime(profile, d.date, d.stbStop.dTimeR)
diff --git a/parse/movement.js b/parse/movement.js
index 2fe3d132..bf2378ef 100644
--- a/parse/movement.js
+++ b/parse/movement.js
@@ -26,6 +26,7 @@ const createParseMovement = (profile, locations, lines, remarks) => {
 
 		const res = {
 			direction: profile.parseStationName(m.dirTxt),
+			trip: m.jid && +m.jid.split('|')[1] || null, // todo: this seems brittle
 			line: lines[m.prodX] || null,
 			location: m.pos ? {
 				type: 'location',