diff --git a/src/normal.c b/src/normal.c
index d78a53b..fbeffe5 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5954,7 +5954,9 @@
 	    curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
     }
 
-    cursor_correct();	/* correct for 'so' */
+    /* Correct for 'so', except when an operator is pending. */
+    if (cap->oap->op_type == OP_NOP)
+	cursor_correct();
     beginline(BL_SOL | BL_FIX);
 }
 
diff --git a/src/version.c b/src/version.c
index 30a13fc..edc29cc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1201,
+/**/
     1200,
 /**/
     1199,