Fixed CPP issue