Made some correction for control.