METAMODEL-58: Fixed