Fix button group bug