diff --git a/src/buffer.c b/src/buffer.c
index 4049f71..020e7e5 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3710,7 +3710,7 @@
 	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 b248fc3..84450a8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    218,
+/**/
     217,
 /**/
     216,