ADD: rehash in HashKey for collision avoidance