Restored the redundant hashing code