diff --git a/ohmpi/hardware_components/abstract_hardware_components.py b/ohmpi/hardware_components/abstract_hardware_components.py
index 3843b35da67b192b6995a85c985f55ad496b6cc8..74394fa2a4775dfbd54f3eeea8d1abb49a439223 100644
--- a/ohmpi/hardware_components/abstract_hardware_components.py
+++ b/ohmpi/hardware_components/abstract_hardware_components.py
@@ -141,7 +141,7 @@ class MuxAbstract(ABC):
         if cabling is not None:
             for k, v in cabling.items():
                 if v[0] == self.board_id:
-                    self.cabling.update({k: (v, k[1])})
+                    self.cabling.update({k: (v[1], k[1])})
         self.exec_logger.debug(f'{self.board_id} cabling: {self.cabling}')
         self.addresses = kwargs.pop('addresses', None)
         self._barrier = kwargs.pop('barrier', Barrier(1))
diff --git a/ohmpi/hardware_components/mux_2023_0_X.py b/ohmpi/hardware_components/mux_2023_0_X.py
index cf249a1dc5f53016afd8d76abc7e331d56e87943..565cfa12fd9ddd49ae0a8458062d23199fe8095d 100644
--- a/ohmpi/hardware_components/mux_2023_0_X.py
+++ b/ohmpi/hardware_components/mux_2023_0_X.py
@@ -90,7 +90,7 @@ class Mux(MuxAbstract):
         electrodes = kwargs.pop('electrodes', None)
         self.cabling = {}
         if cabling is None:
-            self.cabling = {(e, r): i + 1 for r in roles for i, e in enumerate(electrodes)}
+            self.cabling = {(e, r): (self.board_id, i + 1) for r in roles for i, e in enumerate(electrodes)}
         self._tca = [adafruit_tca9548a.TCA9548A(self.connection, kwargs['mux_tca_address'])[i] for i in np.arange(7, 3, -1)]
         # self._mcp_addresses = (kwargs.pop('mcp', '0x20'))  # TODO: add assert on valid addresses..
         self._mcp = [None, None, None, None]
@@ -107,7 +107,7 @@ class Mux(MuxAbstract):
         self.addresses = {}
         d = {}
         for k, v in self.cabling.items():
-            d.update({k: ic[(v[0], self._roles[k])]})
+            d.update({k: ic[(v[0], self._roles[k[1]])]})
         self.addresses = d
 
     def reset(self):
diff --git a/ohmpi/hardware_components/mux_2024_0_X.py b/ohmpi/hardware_components/mux_2024_0_X.py
index 2a88f825defa56df6d42b530a9a7123c855e1585..fb4501165b9f953d254ded476e12350ba82fd1fe 100644
--- a/ohmpi/hardware_components/mux_2024_0_X.py
+++ b/ohmpi/hardware_components/mux_2024_0_X.py
@@ -87,7 +87,7 @@ class Mux(MuxAbstract):
         electrodes = kwargs.pop('electrodes', None)
         self.cabling = {}
         if cabling is None:
-            self.cabling = {(e, r): i + 1 for r in roles for i, e in enumerate(electrodes)}
+            self.cabling = {(e, r): (self.board_id, i + 1) for r in roles for i, e in enumerate(electrodes)}
 
         # Setup TCA
         tca_address = kwargs.pop('tca_address', None)
@@ -126,7 +126,7 @@ class Mux(MuxAbstract):
         self.addresses = {}
         d = {}
         for k, v in self.cabling.items():
-            d.update({k: ic[(v[0], self._roles[k])]})
+            d.update({k: ic[(v[0], self._roles[k[1]])]})
         self.addresses = d
 
     def reset(self):