diff --git a/src/ops.c b/src/ops.c
index bf65191..e1048c2 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3844,7 +3844,11 @@
 		    ml_replace(lnum, newp, FALSE);
 		    /* Place cursor on last putted char. */
 		    if (lnum == curwin->w_cursor.lnum)
+		    {
+			/* make sure curwin->w_virtcol is updated */
+			changed_cline_bef_curs();
 			curwin->w_cursor.col += (colnr_T)(totlen - 1);
+		    }
 		}
 #ifdef FEAT_VISUAL
 		if (VIsual_active)
diff --git a/src/version.c b/src/version.c
index 89e6e11..739b63e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    97,
+/**/
     96,
 /**/
     95,