Fix issue with checkbuttons