diff --git a/src/screen.c b/src/screen.c
index 909a606..abbd911 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4646,6 +4646,8 @@
 		else if (c != NUL)
 		{
 		    p_extra = transchar(c);
+		    if (n_extra == 0)
+			n_extra = byte2cells(c) - 1;
 #ifdef FEAT_RIGHTLEFT
 		    if ((dy_flags & DY_UHEX) && wp->w_p_rl)
 			rl_mirror(p_extra);	/* reverse "<12>" */
diff --git a/src/version.c b/src/version.c
index 6b730cb..84bc24a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    371,
+/**/
     370,
 /**/
     369,