diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 6c94716e66..fa844b2946 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -2286,9 +2286,7 @@ bool Cursor::upDownInText(bool up)
 		}
 
 		Row const & real_next_row = tm.parMetrics(pit()).rows()[next_row];
-		auto [b, p] = tm.getPosNearX(real_next_row, xo);
-		pos() = p;
-		boundary(b);
+		tie(pos(), boundary()) = tm.getPosNearX(real_next_row, xo);
 		// When selection==false, this is done by TextMetrics::editXY
 		setCurrentFont();
 
diff --git a/src/DocIterator.h b/src/DocIterator.h
index 7c6f017b5f..543f10a60b 100644
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -129,6 +129,8 @@ public:
 	///
 	bool boundary() const { return boundary_; }
 	///
+	bool & boundary() { return boundary_; }
+	///
 	void boundary(bool b) { boundary_ = b; }
 
 	// the two methods below have been inlined out because of