[ ! ] Button fix for grouping