Fixed EIC grouping