diff --git a/src/buffer.c b/src/buffer.c
index 4049f711b6..020e7e5d82 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3710,7 +3710,7 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, t
 	case STL_BYTEVAL_X:
 	    base = 'X';
 	case STL_BYTEVAL:
-	    if (((State & INSERT) && wp == curwin) || empty_line)
+	    if (wp->w_cursor.col > STRLEN(linecont))
 		num = 0;
 	    else
 	    {
diff --git a/src/version.c b/src/version.c
index b248fc350d..84450a85ca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    218,
 /**/
     217,
 /**/