Fix cpp cms