diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
index 3398f18..cfef320 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
@@ -194,8 +194,8 @@
 				}
 			}
 			if (!bReduced) return this;
-			Term newTerm = new Term(symbol, newChildren);
-			newTerm.setType(type);
+			Term newTerm = (Term) this.clone();
+			newTerm.children = newChildren;
 			return newTerm;
 		}
 	}
diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
index bb90111..0f5b6c6 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
@@ -253,7 +253,7 @@
 							nextEvents.add(nextEvent);
 						}
 					}
-					if (invDependency.size() == 0) {
+					if (nextEvents.size() == 0) {
 						Event nextEvent = new Event(channel, inResPath, nextSystemState.getResource(inResId));
 						nextEvent.setMessage(nextEvent.updateDependingParameters(resourceStateValueProvider));
 						nextEvents.add(nextEvent);