diff --git a/src/tree_schema_helpers.c b/src/tree_schema_helpers.c
index 396b9f7..cd056d9 100644
--- a/src/tree_schema_helpers.c
+++ b/src/tree_schema_helpers.c
@@ -1184,7 +1184,7 @@
 }
 
 enum yang_keyword
-match_keyword(const char *data)
+match_keyword(const char *data, size_t len)
 {
 /* TODO make this function usable in get_keyword function */
 #define MOVE_IN(DATA, COUNT) (data)+=COUNT;
@@ -1192,6 +1192,7 @@
 #define IF_KEYWORD_PREFIX(STR, LEN) if (!strncmp((data), STR, LEN)) {MOVE_IN(data, LEN);
 #define IF_KEYWORD_PREFIX_END }
 
+    const char *start = data;
     enum yang_keyword kw = YANG_NONE;
     /* read the keyword itself */
     switch (*data) {
@@ -1375,6 +1376,10 @@
         break;
     }
 
-    /* TODO important fix whole keyword must be matched */
-    return kw;
+    if (data - start == (long int)len) {
+        return kw;
+    } else {
+        return YANG_NONE;
+    }
+
 }
diff --git a/src/tree_schema_internal.h b/src/tree_schema_internal.h
index 1d9ff5d..563ec0f 100644
--- a/src/tree_schema_internal.h
+++ b/src/tree_schema_internal.h
@@ -545,5 +545,5 @@
 /**
  * @brief match yang keyword
  */
-enum yang_keyword match_keyword(const char *data);
+enum yang_keyword match_keyword(const char *data, size_t len);
 #endif /* LY_TREE_SCHEMA_INTERNAL_H_ */