Fix for radio button and checkbox