diff --git a/modules/sachsen/backend.py b/modules/sachsen/backend.py
index b3e7a924..4c87c0f7 100644
--- a/modules/sachsen/backend.py
+++ b/modules/sachsen/backend.py
@@ -38,7 +38,8 @@ class SachsenLevelBackend(BaseBackend, ICapGauge):
 
     def iter_gauges(self, pattern=None):
         if pattern is None:
-            return self.browser.get_rivers_list()
+            for gauge in self.browser.get_rivers_list():
+                yield gauge
         else:
             lowpattern = pattern.lower()
             for gauge in self.browser.get_rivers_list():
@@ -55,7 +56,7 @@ class SachsenLevelBackend(BaseBackend, ICapGauge):
 
     def iter_sensors(self, gauge, pattern=None):
         if not isinstance(gauge, Gauge):
-            gauge = find_id_list(self.browser.get_rivers_list(), _id, error=SensorNotFound)
+            gauge = find_id_list(self.browser.get_rivers_list(), gauge, error=SensorNotFound)
         if pattern is None:
             for sensor in gauge.sensors:
                 yield sensor