Fixup for other variants