RadioButton bug fixing