diff --git a/src/charset.c b/src/charset.c
index 19b0895..399f258 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1678,6 +1678,9 @@
     }
     clear_chartabsize_arg(&cts);
 
+    if (*ptr == NUL && pos->col < MAXCOL && pos->col > ptr - line)
+	pos->col = ptr - line;
+
     if (start != NULL)
 	*start = vcol + head;
     if (end != NULL)
diff --git a/src/version.c b/src/version.c
index b88ec9d..935b533 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    707,
+/**/
     706,
 /**/
     705,