Fix abuse of HashTable