diff --git a/src/screen.c b/src/screen.c
index 66d50a5..95a8914 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7140,7 +7140,7 @@
 	     * 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 93b7957..d51c877 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    9,
+/**/
     8,
 /**/
     7,