fix last commits for using the CPP variable