METAMODEL-30: Fixed