Reordered kp zero to match upstream