Little bit correct CHAP1.cpp and CHAP4.cpp