Fixed #52 - checkboxes, again