diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 17fec33ecd..9782557c13 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3250,6 +3250,9 @@ find_command(exarg_T *eap, int *full UNUSED)
 
 	if (ASCII_ISLOWER(eap->cmd[0]))
 	{
+	    int c1 = eap->cmd[0];
+	    int c2 = eap->cmd[1];
+
 	    if (command_count != (int)CMD_SIZE)
 	    {
 		iemsg((char_u *)_("E943: Command table needs to be updated, run 'make cmdidxs'"));
@@ -3258,8 +3261,6 @@ find_command(exarg_T *eap, int *full UNUSED)
 
 	    /* Use a precomputed index for fast look-up in cmdnames[]
 	     * taking into account the first 2 letters of eap->cmd. */
-	    int c1 = eap->cmd[0];
-	    int c2 = eap->cmd[1];
 	    eap->cmdidx = cmdidxs1[CharOrdLow(c1)];
 	    if (ASCII_ISLOWER(c2))
 		eap->cmdidx += cmdidxs2[CharOrdLow(c1)][CharOrdLow(c2)];
diff --git a/src/version.c b/src/version.c
index 9717094226..e19da86a12 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    506,
 /**/
     505,
 /**/