Fix CPP issue