Correct 2 bugs relevant with k1 and k2