diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
index 57fea37..794a44d 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
@@ -46,25 +46,6 @@
 
         this.editor = new Editor(graphComponent);
 
-        graph.getModel().addListener(mxEvent.CHANGE, new mxIEventListener() {
-            public void invoke(Object sender, mxEventObject evt) {
-                List<mxCell> terminals = new ArrayList<>();
-                mxCell cell = null;
-                for (Object change : ((List) evt.getProperties().get("changes"))) {
-                    if (change instanceof mxGraphModel.mxTerminalChange) {
-                        mxGraphModel.mxTerminalChange terminalChange = (mxGraphModel.mxTerminalChange) change;
-                        cell = (mxCell) terminalChange.getCell();
-                        mxCell terminal = (mxCell) terminalChange.getTerminal();
-                        terminals.add(terminal);
-                    }
-                }
-                if (terminals.size() == 2) {
-                    if (!editor.connectEdge(cell, terminals.get(0), terminals.get(1))) {
-                        graph.removeCells(new mxCell[]{cell});
-                    }
-                }
-            }
-        });
         getContentPane().add(graphComponent);
         new mxRubberband(graphComponent);
         graph.setAllowDanglingEdges(false);
diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java
index 34117ba..d4d0006 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java
@@ -275,7 +275,7 @@
             DataTransferChannel ch2 = parser.parseChannel(getModel());
             for (ChannelMember chm2 : ch2.getInputChannelMembers()) {
                 for (ChannelMember chm : ch.getInputChannelMembers()) {
-                    if (chm2.getResource() == chm.getResource()) {
+                    if (chm2.getResource().getResourceHierarchy() == chm.getResource().getResourceHierarchy()) {
                         chm.setStateTransition(chm2.getStateTransition());
                         break;
                     }
@@ -283,7 +283,7 @@
             }
             for (ChannelMember chm2 : ch2.getOutputChannelMembers()) {
                 for (ChannelMember chm : ch.getOutputChannelMembers()) {
-                    if (chm2.getResource() == chm.getResource()) {
+                    if (chm2.getResource().getResourceHierarchy() == chm.getResource().getResourceHierarchy()) {
                         chm.setStateTransition(chm2.getStateTransition());
                         break;
                     }
@@ -291,7 +291,7 @@
             }
             for (ChannelMember chm2 : ch2.getReferenceChannelMembers()) {
                 for (ChannelMember chm : ch.getReferenceChannelMembers()) {
-                    if (chm2.getResource() == chm.getResource()) {
+                    if (chm2.getResource().getResourceHierarchy() == chm.getResource().getResourceHierarchy()) {
                         chm.setStateTransition(chm2.getStateTransition());
                         break;
                     }