diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/Event.java b/AlgebraicDataflowArchitectureModel/src/simulator/Event.java
index e9e1db3..b9cf65c 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/Event.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/Event.java
@@ -383,7 +383,6 @@
 //			childEvents.add(childEvent);
 //		}
 		
-		message = unifiedMessage;
 		return unifiedMessage;
 	}
 	
diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
index 34c6d32..f1f84bd 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
@@ -287,6 +287,7 @@
 								Event nextEvent = new Event(channel, inResPath, nextSystemState.getResource(inResId));
 								Expression message = nextEvent.constructMessageAndDescendantEvents(resourceStateValueProvider, true);
 								if (message != null) {
+									nextEvent.setMessage(message);
 									if (nextChState == null) {
 										nextChState = new ChannelState(channel);
 										nextSystemState.updateChannelState(channel, nextChState);
@@ -312,6 +313,7 @@
 							Event nextEvent = new Event(channel, inResPath, nextSystemState.getResource(inResId));
 							Expression message = nextEvent.constructMessageAndDescendantEvents(resourceStateValueProvider, true);
 							if (message != null) {
+								nextEvent.setMessage(message);
 								nextEvents.add(nextEvent);
 							}
 						}
@@ -368,6 +370,7 @@
 												Event nextEvent = new Event(channel, inResPath, nextSystemState.getResource(inResId), channelSelectorValues, dependingVarToVal);
 												Expression message = nextEvent.constructMessageAndDescendantEvents(resourceStateValueProvider, false);
 												if (message != null) {
+													nextEvent.setMessage(message);
 													nextEvents.add(nextEvent);
 												}
 											}