Fix/variant groups