diff --git a/src/screen.c b/src/screen.c
index c9f447c9ca..92eb232ef0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5332,8 +5332,9 @@ char_needs_redraw(off_from, off_to, cols)
 		    && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to]
 			|| (ScreenLinesUC[off_from] != 0
 			    && comp_char_differs(off_from, off_to))
-			|| (cols > 1 && ScreenLines[off_from + 1]
-						 != ScreenLines[off_to + 1])))
+			|| ((*mb_off2cells)(off_from, off_from + cols) > 1
+			    && ScreenLines[off_from + 1]
+						  != ScreenLines[off_to + 1])))
 #endif
 	       ))
 	return TRUE;
diff --git a/src/version.c b/src/version.c
index b22c901070..4598c74a00 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    638,
+/**/
+    638,
 /**/
     637,
 /**/