Fix variant switching