CheckButton bug fix