METAMODEL-92: Fixed