diff --git a/src/ex_getln.c b/src/ex_getln.c
index f08ae90326..02c3e30095 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1310,7 +1310,7 @@ getcmdline(
 	    if (c != Ctrl_N && c != Ctrl_G && (c != 'e'
 				    || (ccline.cmdfirstc == '=' && KeyTyped)
 #ifdef FEAT_EVAL
-				    || cmdline_star
+				    || cmdline_star > 0
 #endif
 				    ))
 	    {
@@ -1805,8 +1805,8 @@ getcmdline(
 		new_cmdpos = -1;
 		if (c == '=')
 		{
-		    if (ccline.cmdfirstc == '=' // can't do this recursively
-			    || cmdline_star)	// or when typing a password
+		    if (ccline.cmdfirstc == '='  // can't do this recursively
+			    || cmdline_star > 0) // or when typing a password
 		    {
 			beep_flush();
 			c = ESC;
@@ -6506,8 +6506,11 @@ get_ccline_ptr(void)
     char_u *
 get_cmdline_str(void)
 {
-    struct cmdline_info *p = get_ccline_ptr();
+    struct cmdline_info *p;
 
+    if (cmdline_star > 0)
+	return NULL;
+    p = get_ccline_ptr();
     if (p == NULL)
 	return NULL;
     return vim_strnsave(p->cmdbuff, p->cmdlen);
diff --git a/src/version.c b/src/version.c
index d3b09ea4bf..7f21f2d809 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    436,
 /**/
     435,
 /**/