diff --git a/src/instruction_table.c b/src/instruction_table.c
index 55fec6d..52c55b5 100644
--- a/src/instruction_table.c
+++ b/src/instruction_table.c
@@ -108,7 +108,7 @@ void destroy_instruction_information_hashtable(shash_hashtable_t *instruction_in
         current_instr_config = config[i];
 	free(shash_get(current_instr_config.name, current_instr_config.name_length, instruction_information_table));
         i++;
-    } while (strncmp(current_instr_config.name, "", MAX_TOKEN_SIZE) != 0);
+    } while (config[i].name != 0);
 
     // Destroy the actual hashtable
     shash_destroy_hashtable(instruction_information_table);