ControlPlaneSuite - fix 2