Fix for button groups