@@ -295,7 +295,7 @@ static int ac_maketrans(struct cli_matcher *root)

 	    continue;

 	for(i = 0; i < 256; i++) {

 	    child = node->trans[i];

-	    if(!child) {

+	    if (!child || (!IS_FINAL(child) && IS_LEAF(child))) {

 		struct cli_ac_node *failtarget = node->fail;

 		while(IS_LEAF(failtarget) || !failtarget->trans[i])

 		    failtarget = failtarget->fail;

@@ -892,14 +892,12 @@ int cli_ac_scanbuff(const unsigned char *buffer, uint32_t length, const char **v

     current = root->ac_root;

     for(i = 0; i < length; i++)  {

-

-	if(IS_LEAF(current))

-	    current = current->fail;

-

 	current = current->trans[buffer[i]];

 	if(IS_FINAL(current)) {

 	    patt = current->list;

+	    if (IS_LEAF(current))

+		current = current->fail;

 	    while(patt) {

 		bp = i + 1 - patt->depth;

 		if(ac_findmatch(buffer, bp, length, patt, &matchend)) {