Fixed Bug for issue ci-937
Condition for checkboxes added