diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java b/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
index 645ed14..cac52a4 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
@@ -275,12 +275,11 @@
 	}
 
 	public Map.Entry<ResourceState, ResourceIdentifier> createResourceState(ResourceIdentifier resourceIdentifier, Expression resStateValue) {
-//		Type resType = null;
-//		if (resStateValue instanceof Term) {
-//			resType = ((Term) resStateValue).getType();
-//			resStateValue = ((Term) resStateValue).reduce();
-//		}
 		Type resType = resourceIdentifier.getResourceStateType();
+		if (resType == null && resStateValue instanceof Term) {
+			resType = ((Term) resStateValue).getType();
+			resStateValue = ((Term) resStateValue).reduce();
+		}
 		if (resType != null) {
 			if (DataConstraintModel.typeList.isAncestorOf(resType)) {
 				if (resStateValue instanceof Constant) {