diff --git a/include/define.h b/include/define.h
index 126e932..6ba0353 100644
--- a/include/define.h
+++ b/include/define.h
@@ -13,4 +13,19 @@ typedef unsigned char bool;
 #define TRUE 1
 
 
+#define DEBUG 1
+#ifdef DEBUG
+
+#define info(fmt, ...) \
+            do { fprintf(stderr, fmt, __VA_ARGS__); } while (0)
+
+#define debug(fmt, ...) \
+        do { fprintf(stderr, "%s:%d:%s(): " fmt, __FILE__, \
+                                __LINE__, __func__, __VA_ARGS__); } while (0)
+
+#else
+#define info(...);
+#define debug(...);
+#endif
+
 #endif /* !DEFINE_H */
diff --git a/src/node.c b/src/node.c
index 5e16282..80307ca 100644
--- a/src/node.c
+++ b/src/node.c
@@ -12,6 +12,7 @@
 // Judy array
 #include <Judy.h>
 
+#include "define.h"
 #include "str.h"
 #include "node.h"
 #include "token.h"
@@ -19,8 +20,6 @@
 
 // String value as the index http://judy.sourceforge.net/doc/JudySL_3x.htm
 
-
-
 /**
  * Create a rnode object
  */
@@ -165,7 +164,7 @@ void rnode_compile_patterns(rnode * n) {
 
 rnode * rnode_match(rnode * n, char * path, int path_len) {
     if (n->combined_pattern && n->pcre_pattern) {
-        // printf("pcre matching /%s/ on %s\n", n->combined_pattern, path);
+        info("pcre matching %s on %s\n", n->combined_pattern, path);
         // int ovector_count = (n->edge_len + 1) * 2;
         int ovector_count = 30;
         int ovector[ovector_count];
@@ -180,7 +179,7 @@ rnode * rnode_match(rnode * n, char * path, int path_len) {
                 ovector,           /* output vector for substring information */
                 ovector_count);      /* number of elements in the output vector */
 
-        printf("rc: %d\n", rc );
+        info("rc: %d\n", rc );
         if (rc < 0) {
             switch(rc)
             {
@@ -199,12 +198,12 @@ rnode * rnode_match(rnode * n, char * path, int path_len) {
         {
             char *substring_start = path + ovector[2*i];
             int   substring_length = ovector[2*i+1] - ovector[2*i];
-            printf("%2d: %.*s\n", i, substring_length, substring_start);
+            info("%2d: %.*s\n", i, substring_length, substring_start);
             if ( substring_length > 0) {
-                int len = path_len - substring_length; // fully match to the end
-                // printf("len:%d edges:%d i:%d\n", len, n->edge_len, i);
-                if (len) {
-                    return rnode_match( n->edges[i - 1]->child, substring_start, len);
+                int restlen = path_len - ovector[2*i+1]; // fully match to the end
+                info("matched item => restlen:%d edges:%d i:%d\n", restlen, n->edge_len, i);
+                if (restlen) {
+                    return rnode_match( n->edges[i - 1]->child, substring_start + substring_length, restlen);
                 }
                 return n->edges[i - 1]->child;
             }
diff --git a/tests/test_tree.c b/tests/test_tree.c
index 57706e3..c0c693b 100644
--- a/tests/test_tree.c
+++ b/tests/test_tree.c
@@ -55,6 +55,7 @@ START_TEST (test_compile)
     fail_if( n->combined_pattern );
     fail_if( NULL == rnode_find_edge_str(n, "/", strlen("/") ) );
 
+    rnode_insert_routel(n, "/foo/{id}", strlen("/foo/{id}") );
     rnode_insert_routel(n, "/{id}", strlen("/{id}") );
     rnode_compile(n);
     rnode_dump(n, 0);
@@ -81,7 +82,10 @@ START_TEST (test_compile)
     m = rnode_match( n , "/bar", strlen("/bar") );
     fail_if( NULL == m );
 
-    m = rnode_match( n , "/zzz", strlen("/zzz") );
+    m = rnode_match( n , "/xxx", strlen("/xxx") );
+    fail_if( NULL == m );
+
+    m = rnode_match( n , "/foo/xxx", strlen("/foo/xxx") );
     fail_if( NULL == m );
 }
 END_TEST