Added more robust ControlParameter detection.
Added more robust ControlParameter detection.