Finally, fixing the hash table!