Fix hashing, do not use bigint