Fixing kHash overflow (part 2)