Hotfix for MVariant