diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java
index 0483b83..db7a99f 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java
@@ -154,7 +154,7 @@
 			}
 			
 			// Insert an edge
-			CallEdgeAttribute newAttr = new CallEdgeAttribute(targetEdgeAttr.getCallEdge(), dstObjNodeCell, dstNodeCell);
+			CallEdgeAttribute newAttr = new CallEdgeAttribute(targetEdgeAttr.getCallEdge(), targetEdgeAttr.getOriginalSourceObjectNode(),dstObjNodeCell, dstNodeCell);
 			graph.insertEdge(controlLayerCell, "",  newAttr, dstObjNodeCell, dstNodeCell, "movable=false;");
 
 			resetGraph();
@@ -497,7 +497,7 @@
 			
 			if(srcNodeCell == null || dstNodeCell == null) continue;
 
-			CallEdgeAttribute callEdgeAttr = new CallEdgeAttribute(callEdge, srcNodeCell, dstNodeCell);
+			CallEdgeAttribute callEdgeAttr = new CallEdgeAttribute(callEdge, (ObjectNode)callEdge.getSource(), srcNodeCell, dstNodeCell);
 			
 			// If "srcResNode" types of "EntryPointObjectNode" (= channel)
 			// then parameter references to geometry of "outPort".