Fix potential overflow on nibbles