Fixed issue with the chekcboxes