Fixed group match numbering