Attempt to fix issues with metamodel