Fixing kHash overflow (part 1)