1 files changed, 2 insertions, 0 deletions
diff --git a/cli/src/cli.c b/cli/src/cli.c
index 1d500c1abbf..50a6c185344 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -375,6 +375,8 @@ parse_cmdline (int argc, char *argv[], struct cli_state *state)
                         for (j = i; j < state->argc - 1; j++)
                                 state->argv[j] = state->argv[j + 1];
                         state->argc--;
+                        /* argv shifted, next check should be at i again */
+                        i--;
                 }
         }