Fixed HashTable a bit