More completely fixes #8. Issue with order in which checkboxes were checked