Fixed multiple issues with double hasing implementation -- more testing required to verify