Fix regex group number definitions