Partial bug fix for checkboxes