diff --git a/src/screen.c b/src/screen.c
index b7107b6..5acc7dc 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -6413,7 +6413,8 @@
 		    }
 		    else
 		    {
-			nc = utfc_ptr2char(ptr + mbyte_blen, pcc);
+			nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
+				      (int)((text + len) - ptr - mbyte_blen));
 			nc1 = pcc[0];
 		    }
 		    pc = prev_c;
diff --git a/src/version.c b/src/version.c
index 474ae3f..7654400 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    291,
+/**/
     290,
 /**/
     289,