Fixed an issue wieth checkboxes
Same check/fix on radio buttons