diff --git a/plugins/org.eclipse.epsilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java b/plugins/org.eclipse.epsilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java
index d4c015dc8..02b8c6a5f 100644
--- a/plugins/org.eclipse.epsilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java
+++ b/plugins/org.eclipse.epsilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java
@@ -1776,20 +1776,6 @@ public EolModelElementType getModelElementType(String modelAndType, AbstractModu
 			typeName = modelAndType;
 		}
 
-//		for (ModelDeclaration modelDeclaration : modelDeclarations) {
-//			if (modelElementType.getModelName().isEmpty()
-//					|| modelDeclaration.getNameExpression().getName().equals(modelElementType.getModelName())
-//					|| modelDeclaration.getAliasNameExpressions().get(0).getName()
-//							.equals(modelElementType.getModelName())) {
-//				Metamodel metamodel = modelDeclaration.getMetamodel();
-//				if (metamodel != null) {
-//					MetaClass metaClass = metamodel.getMetaClass(modelElementType.getTypeName());
-//					modelElementType.setMetaClass(metaClass);
-//					return modelElementType;
-//				}
-//			}
-//		}
-
 		IModel model = context.repository.getModelByNameSafe(modelName);
 		if (model == null) {
 			return null;
@@ -1808,8 +1794,10 @@ public EolModelElementType getModelElementType(String modelAndType, AbstractModu
 			}
 
 		}
-
-		Metamodel metamodel = context.modelDeclarations.get(model.getName()).getMetamodel();
+		if (modelName == "") {
+			modelName = model.getName();
+		}
+		Metamodel metamodel = context.modelDeclarations.get(modelName).getMetamodel();
 		if (metamodel != null) {
 			EolModelElementType modelElementType = new EolModelElementType(modelAndType);
 			modelElementType.setMetaClass(metamodel.getMetaClass(typeName));