Fixed bug with checkboxes