Complex checkboxes fixed. Fix #1535