Bug fix on radio button