fixed ObjectVariantMapper regression due to recent refactoring