diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index f8b664fd7f586cc6380953ff46437b0382fe6d8a..59e0b8b7fb80ce6defcc9ee9b33eaeec78564523 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -282,6 +282,9 @@ class Mage(CommandLineSolver):
                 if bound.node is None:
                     continue
 
+                if not study.river.is_enable_node(bound.node):
+                    continue
+
                 if bound.bctype == "ZD":
                     AVA.append(bound)
                 elif bound.bctype == "TD" or bound.bctype == "PC":
@@ -357,13 +360,7 @@ class Mage(CommandLineSolver):
         with mage_file_open(os.path.join(repertory, f"{name}.RUG"), "w+") as f:
             files.append(f"{name}.RUG")
 
-            edges = study.river.edges()
-            edges = list(
-                filter(
-                    lambda e: e.is_enable(),
-                    edges
-                )
-            )
+            edges = study.river.enable_edges()
 
             id = 1
             for edge in edges: