There are redundant hash values in the hash value tracker

[Naeemkh]

In some cases, there are redundant hash values in the hash value tracker. Modify it either to set or check before assigning.