New fix for checkboxes