close #619, significantly reduced hashing usage