Fix bug & select button -> radio button