bugfix for checkboxes
fixed merge conflicts