sorry misunderstand the purpose of the commit. But i think this fixes the variant thing, right? (not sure if there are other issues with it)