Fixed the button group logic

which I had broked.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'