ControlPoint Fix