Fix for ChecklistValues