Fix for Checkbox + Required issue