diff --git a/src/screen.c b/src/screen.c
index 4604ec7..5ebca09 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -765,6 +765,9 @@
 	     * uses that. */
 	    gui.col = gui_cursor_col;
 	    gui.row = gui_cursor_row;
+# ifdef FEAT_MBYTE
+	    gui.col = mb_fix_col(gui.col, gui.row);
+# endif
 	    gui_update_cursor(FALSE, FALSE);
 	    screen_cur_col = gui.col;
 	    screen_cur_row = gui.row;
diff --git a/src/version.c b/src/version.c
index b74ad2f..dc8e9cf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    21,
+/**/
     20,
 /**/
     19,