diff --git a/src/utils/graph.ts b/src/utils/graph.ts
index 1870a0fb..4871ceb5 100644
--- a/src/utils/graph.ts
+++ b/src/utils/graph.ts
@@ -210,14 +210,9 @@ export const getNodesInside = (
 };
 
 export const getConnectedEdges = (nodes: Node[], edges: Edge[]): Edge[] => {
-  const nodeIds = nodes.map((n) => n.id);
+  const nodeIds = nodes.map((node) => node.id);
 
-  return edges.filter((e) => {
-    const sourceId = e.source.split('__')[0];
-    const targetId = e.target.split('__')[0];
-
-    return nodeIds.includes(sourceId) || nodeIds.includes(targetId);
-  });
+  return edges.filter((edge) => nodeIds.includes(edge.source) || nodeIds.includes(edge.target));
 };
 
 const parseElements = (nodes: Node[], edges: Edge[]): Elements => {
@@ -225,6 +220,8 @@ const parseElements = (nodes: Node[], edges: Edge[]): Elements => {
     ...nodes.map((node) => {
       const n = { ...node };
 
+      n.position = n.__rf.position;
+
       delete n.__rf;
       return n;
     }),