diff --git a/src/normal.c b/src/normal.c
index 339b7205f7..b16ac8725b 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -701,6 +701,7 @@ normal_cmd(oap, toplevel)
 	else
 	    c = 'c';
 	msg_nowait = TRUE;	/* don't delay going to insert mode */
+	old_mapped_len = 0;	/* do go to Insert mode */
     }
 #endif
 
diff --git a/src/version.c b/src/version.c
index 2e685dcc58..52d9e71914 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    984,
 /**/
     983,
 /**/