diff --git a/src/move.c b/src/move.c
index a0d3a6014..42878e4ad 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1753,7 +1753,12 @@ scrolldown(
 	    ++row;
 	}
 	if (col > width2 && width2 > 0)
+	{
 	    row += col / width2;
+	    // even so col is not used anymore,
+	    // make sure it is correct, just in case
+	    col = col % width2;
+	}
 	if (row >= curwin->w_height)
 	{
 	    curwin->w_curswant = curwin->w_virtcol
@@ -1986,7 +1991,12 @@ adjust_skipcol(void)
 	++row;
     }
     if (col > width2)
+    {
 	row += col / width2;
+	// col may no longer be used, but make
+	// sure it is correct anyhow, just in case
+	col = col % width2;
+    }
     if (row >= curwin->w_height)
     {
 	if (curwin->w_skipcol == 0)
diff --git a/src/version.c b/src/version.c
index 6602a489e..e862e3332 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2005,
 /**/
     2004,
 /**/