Fix for checkboxes