diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java b/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
index 5f25bdb..645ed14 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
@@ -361,7 +361,7 @@
 				if (resStateValue instanceof Constant) {
 				} else if (resStateValue instanceof JsonTerm) {
 					JsonTerm jsonValue = (JsonTerm) resStateValue;
-					MapResourceState state = new MapResourceState();
+					JsonResourceState state = new JsonResourceState();
 					Map.Entry<ResourceState, ResourceIdentifier> createInfo = null;
 					for (String key: jsonValue.keySet()) {
 						String memberName = key.replace("\"", "");
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/SimulatorTest.java b/AlgebraicDataflowArchitectureModel/src/tests/SimulatorTest.java
index ca760bb..bd4494e 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/SimulatorTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/SimulatorTest.java
@@ -156,6 +156,8 @@
 			customer_add_2.getStateTransition().setNextStateExpression(nextStateExp6);
 			c.addChannelMemberAsOutput(customer_add_2);
 			
+			model.addInputChannel(cio_addCustomer);
+			model.addInputChannel(cio_addCompany);
 			model.addInputChannel(cio_setCustomerOff);
 			model.addInputChannel(cio_setCompanyAdd);
 			model.addChannel(c);