diff --git a/src/screen.c b/src/screen.c
index 6e6f11b70b..b3fe3705e0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -848,7 +848,7 @@ skip_opacity:
 #ifdef FEAT_GUI
 		&& !gui.in_use
 #endif
-		&& col + coloff > 0)
+		&& col + coloff > 0 && off_to > 0)
 	{
 	    if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1])
 	    {
diff --git a/src/version.c b/src/version.c
index 871f3b2392..336ac8894f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    39,
 /**/
     38,
 /**/