diff --git a/src/edit.c b/src/edit.c
index ee63daa..13faafe 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -6918,6 +6918,8 @@
 		curwin->w_cursor = tpos;
 	    else
 	    {
+		/* reset tpos, could have been invalidated in the loop above */
+		tpos = curwin->w_cursor;
 		tpos.col++;
 		if (cc != NUL && gchar_pos(&tpos) == NUL)
 		    ++curwin->w_cursor.col;	/* put cursor back on the NUL */
diff --git a/src/version.c b/src/version.c
index df18f5e..5ca2f27 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    514,
+/**/
     513,
 /**/
     512,