diff --git a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/CallGraph.java b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/CallGraph.java
index fbd3356..954c688 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/CallGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/CallGraph.java
@@ -16,19 +16,22 @@
 	}
 	
 	public void addNode(Node node) {
-		super.addNode(node);
 		if (node instanceof ResourceNode) {
 			ResourceNode resNode = (ResourceNode) node;
 			StatefulObjectNode objNode = statefulObjMap.get(resNode);
 			if (objNode == null) {
 				objNode = new StatefulObjectNode(resNode);
 				statefulObjMap.put(resNode, objNode);
+				super.addNode(objNode);
 			}
 		} else if (node instanceof StatefulObjectNode) {
 			StatefulObjectNode objNode = (StatefulObjectNode) node;
 			if (statefulObjMap.get(objNode.getResource()) == null) {
 				statefulObjMap.put(objNode.getResource(), objNode);
+				super.addNode(objNode);
 			}
+		} else {
+			super.addNode(node);
 		}
 	}
 
diff --git a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
index 5d4b77e..be1d510 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
@@ -111,7 +111,15 @@
 	public Set<Node> getAllNodes() {
 		Set<Node> allNodes = new HashSet<>();
 		allNodes.addAll(pushCallGraph.getNodes());
-		allNodes.addAll(pullCallGraph.getNodes());
+		for (Node n: pullCallGraph.getNodes()) {
+			if (n instanceof StatefulObjectNode) {
+				if (pushCallGraph.getStatefulObjectNode(((StatefulObjectNode) n).getResource()) == null) {
+					allNodes.add(n);
+				}
+			} else {
+				allNodes.add(n);
+			}
+		}
 		return allNodes;
 	}
 }