diff --git a/src/screen.c b/src/screen.c
index 66d50a542..95a89144c 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7140,7 +7140,7 @@ screen_fill(start_row, end_row, start_col, end_col, c1, c2, attr)
 	     * terminal. */
 	    if (mb_fix_col(start_col, row) != start_col)
 		screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0);
-	    if (mb_fix_col(end_col, row) != end_col)
+	    if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col)
 		screen_puts_len((char_u *)" ", 1, row, end_col, 0);
 	}
 #endif
diff --git a/src/version.c b/src/version.c
index 93b795784..d51c8777b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    9,
 /**/
     8,
 /**/