Fixed grouping of variants