Fix issue with checkbox changes