Fix issue with Checkboxes validation