Fixed an issue with checkbox expand/collapse