Fixes issue on checkboxes