Fix issues with hashing