ControlPlaneSuite - fix 3