Fix Bug, make checkboxes stay checked