Fixing Variant Serializer