diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c
index 4e156b8..3dbcf8f 100644
--- a/src/ctrl/control_cmd.c
+++ b/src/ctrl/control_cmd.c
@@ -86,7 +86,7 @@
 			cmd_desc = &cmd_el->strcmd;
 			if (cmd_desc->nr_commands > vector_active(vline))
 				continue;
-			for (j =0; j < vector_active(vline); j++) {
+			for (j =0; j < vector_active(vline) && j < cmd_desc->nr_commands; j++) {
 				str = vector_slot(vline, j);
 				desc = cmd_desc->command[j];
 				if (desc[0] == '*')