Fixed hashing bugs