diff --git a/src/numex.c b/src/numex.c
index 81cdf7c9..4e8c0154 100644
--- a/src/numex.c
+++ b/src/numex.c
@@ -726,7 +726,7 @@ numex_result_array *convert_numeric_expressions(char *str, char *lang) {
             continue;
         }
 
-        phrase_t phrase = trie_search_prefixes_from_index(trie, str + idx, start_node_id);
+        phrase_t phrase = trie_search_prefixes_from_index(trie, str + idx, len - idx, start_node_id);
 
         state = start_state;
 
@@ -927,7 +927,7 @@ char *get_ordinal_suffix(char *numeric_string, char *lang, numex_result_t result
         return NULL;
     }
 
-    phrase_t phrase = trie_search_suffixes_from_index(trie, numeric_string, prefix.node_id);
+    phrase_t phrase = trie_search_suffixes_from_index(trie, numeric_string, strlen(numeric_string), prefix.node_id);
 
     if (phrase.len == 0) {
         return NULL;
diff --git a/src/trie_search.c b/src/trie_search.c
index 2d702e4f..fe5afa98 100644
--- a/src/trie_search.c
+++ b/src/trie_search.c
@@ -404,7 +404,7 @@ inline phrase_array *trie_search_tokens(trie_t *self, char *str, token_array *to
     return trie_search_tokens_from_index(self, str, tokens, ROOT_NODE_ID);
 }
 
-phrase_t trie_search_suffixes_from_index(trie_t *self, char *word, uint32_t start_node_id) {
+phrase_t trie_search_suffixes_from_index(trie_t *self, char *word, size_t len, uint32_t start_node_id) {
     uint32_t last_node_id = start_node_id;
     trie_node_t last_node = trie_get_node(self, last_node_id);
     uint32_t node_id = last_node_id;
@@ -413,7 +413,6 @@ phrase_t trie_search_suffixes_from_index(trie_t *self, char *word, uint32_t star
     uint32_t value = 0, phrase_start = 0, phrase_len = 0;
 
     ssize_t char_len;
-    size_t len = strlen(word);
 
     int32_t unich = 0;
 
@@ -506,7 +505,7 @@ phrase_t trie_search_suffixes_from_index(trie_t *self, char *word, uint32_t star
     return (phrase_t) {phrase_start, phrase_len, value};
 }
 
-inline phrase_t trie_search_suffixes(trie_t *self, char *word) {
+inline phrase_t trie_search_suffixes(trie_t *self, char *word, size_t len) {
     trie_node_t root_node = trie_get_root(self);
     uint32_t node_id = trie_get_transition_index(self, root_node, TRIE_SUFFIX_CHAR);
     trie_node_t node = trie_get_node(self, node_id);
@@ -515,10 +514,10 @@ inline phrase_t trie_search_suffixes(trie_t *self, char *word) {
         return (phrase_t){0, 0, 0};
     }
 
-    return trie_search_suffixes_from_index(self, word, node_id);
+    return trie_search_suffixes_from_index(self, word, len, node_id);
 }
 
-phrase_t trie_search_prefixes_from_index(trie_t *self, char *word, uint32_t start_node_id) {
+phrase_t trie_search_prefixes_from_index(trie_t *self, char *word, size_t len, uint32_t start_node_id) {
     log_debug("Call to trie_search_prefixes_from_index\n");
     uint32_t node_id = start_node_id, last_node_id = node_id;
     trie_node_t node = trie_get_node(self, node_id), last_node = node;
@@ -528,7 +527,6 @@ phrase_t trie_search_prefixes_from_index(trie_t *self, char *word, uint32_t star
     uint8_t *ptr = (uint8_t *)word;
 
     ssize_t char_len = 0;
-    size_t len = strlen(word);
 
     size_t idx = 0;
 
@@ -541,7 +539,7 @@ phrase_t trie_search_prefixes_from_index(trie_t *self, char *word, uint32_t star
     trie_data_node_t data_node;
     trie_node_t terminal_node;
 
-    for (; *ptr; last_node = node, last_node_id = node_id) {
+    for (; idx < len; last_node = node, last_node_id = node_id) {
         unsigned char ch = *ptr;
 
         log_debug("Getting transition index for %d, (%d, %d)\n", last_node_id, last_node.base, last_node.check);
@@ -632,7 +630,7 @@ phrase_t trie_search_prefixes_from_index(trie_t *self, char *word, uint32_t star
     return (phrase_t) {phrase_start, phrase_len, value};
 }
 
-inline phrase_t trie_search_prefixes(trie_t *self, char *word) {
+inline phrase_t trie_search_prefixes(trie_t *self, char *word, size_t len) {
     trie_node_t root_node = trie_get_root(self);
     uint32_t node_id = trie_get_transition_index(self, root_node, TRIE_PREFIX_CHAR);
     trie_node_t node = trie_get_node(self, node_id);
@@ -641,7 +639,7 @@ inline phrase_t trie_search_prefixes(trie_t *self, char *word) {
         return (phrase_t){0, 0, 0};
     }
 
-    return trie_search_prefixes_from_index(self, word, node_id);
+    return trie_search_prefixes_from_index(self, word, len, node_id);
 }
 
 
diff --git a/src/trie_search.h b/src/trie_search.h
index 9ecfaffa..a3cf1be0 100644
--- a/src/trie_search.h
+++ b/src/trie_search.h
@@ -29,10 +29,10 @@ phrase_array *trie_search(trie_t *self, char *text);
 phrase_array *trie_search_from_index(trie_t *self, char *text, uint32_t start_node_id);
 phrase_array *trie_search_tokens(trie_t *self, char *str, token_array *tokens);
 phrase_array *trie_search_tokens_from_index(trie_t *self, char *str, token_array *tokens, uint32_t start_node_id);
-phrase_t trie_search_suffixes_from_index(trie_t *self, char *word, uint32_t start_node_id);
-phrase_t trie_search_suffixes(trie_t *self, char *word);
-phrase_t trie_search_prefixes_from_index(trie_t *self, char *word, uint32_t start_node_id);
-phrase_t trie_search_prefixes(trie_t *self, char *word);
+phrase_t trie_search_suffixes_from_index(trie_t *self, char *word, size_t len, uint32_t start_node_id);
+phrase_t trie_search_suffixes(trie_t *self, char *word, size_t len);
+phrase_t trie_search_prefixes_from_index(trie_t *self, char *word, size_t len, uint32_t start_node_id);
+phrase_t trie_search_prefixes(trie_t *self, char *word, size_t len);