Button group fix