Fix RadioGroup issue