diff --git a/src/numex.c b/src/numex.c
index d453d134..6c6a7fa9 100644
--- a/src/numex.c
+++ b/src/numex.c
@@ -559,14 +559,17 @@ bool numex_table_save(char *filename) {
     }
 }
 
+bool numex_module_init(void) {
+    numex_table = numex_table_new();
+    return numex_table != NULL;
+}
+
 /* Initializes numex trie/module
 Must be called only once before the module can be used
 */
+
 bool numex_module_setup(char *filename) {
-    if (filename == NULL && numex_table == NULL) {
-        numex_table = numex_table_new();
-        return numex_table != NULL;
-    } else if (numex_table == NULL) {
+    if (numex_table == NULL) {
         return numex_table_load(filename == NULL ? DEFAULT_NUMEX_PATH : filename);
     }
     return false;
diff --git a/src/numex.h b/src/numex.h
index badef1c2..421435ec 100644
--- a/src/numex.h
+++ b/src/numex.h
@@ -146,6 +146,7 @@ char *get_ordinal_suffix(char *numeric_string, char *lang, numex_result_t result
 bool numex_table_write(FILE *file);
 bool numex_table_save(char *filename);
 
+bool numex_module_init(void);
 bool numex_module_setup(char *filename);
 void numex_module_teardown(void);
 
diff --git a/src/numex_table_builder.c b/src/numex_table_builder.c
index ade3d80b..059d1dce 100644
--- a/src/numex_table_builder.c
+++ b/src/numex_table_builder.c
@@ -26,7 +26,7 @@ int main(int argc, char **argv) {
         exit(1);
     }
 
-    if (!numex_module_setup(NULL)) {
+    if (!numex_module_init()) {
         log_error("Numex table initialization unsuccessful\n");
         numex_module_teardown();
         exit(1);