ControlPlaneSuite - fix 1