diff --git a/src/getchar.c b/src/getchar.c
index fb28160e54..ecb0379007 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3290,9 +3290,9 @@ do_map(maptype, arg, mode, abbrev)
      */
     if (haskey)
 	keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, special);
+    orig_rhs = rhs;
     if (hasarg)
     {
-	orig_rhs = rhs;
 	if (STRICMP(rhs, "<nop>") == 0)	    /* "<Nop>" means nothing */
 	    rhs = (char_u *)"";
 	else
diff --git a/src/version.c b/src/version.c
index 8e5e90af9b..d9d2b58b7d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    45,
 /**/
     44,
 /**/