fix group matching