Fix group matching