diff --git a/hub/city_model_structure/building_demand/thermal_zone.py b/hub/city_model_structure/building_demand/thermal_zone.py
index 6ea08324..386e8c4b 100644
--- a/hub/city_model_structure/building_demand/thermal_zone.py
+++ b/hub/city_model_structure/building_demand/thermal_zone.py
@@ -578,7 +578,7 @@ class ThermalZone:
     for i_type, _ in enumerate(_types_reference):
       _schedules = []
       _schedule_type = _types_reference[i_type][1]
-      for _, schedule_value in enumerate(_schedule_type):
+      for i_schedule, schedule_value in enumerate(_schedule_type):
         schedule = Schedule()
         schedule.type = schedule_value.type
         schedule.day_types = schedule_value.day_types
diff --git a/tests/test_systems_factory.py b/tests/test_systems_factory.py
index 07c9683a..420e4172 100644
--- a/tests/test_systems_factory.py
+++ b/tests/test_systems_factory.py
@@ -55,6 +55,7 @@ class TestSystemsFactory(TestCase):
 
     EnergySystemsFactory('montreal_custom', self._city).enrich()
     self.assertEqual(17, len(self._city.energy_systems_connection_table))
+    self.assertEqual(1, len(self._city.generic_energy_systems))
 
   def test_montreal_custom_system_results(self):
     """
@@ -126,6 +127,7 @@ class TestSystemsFactory(TestCase):
 
     EnergySystemsFactory('north_america', self._city).enrich()
     self.assertEqual(17, len(self._city.energy_systems_connection_table))
+    self.assertEqual(1, len(self._city.generic_energy_systems))
 
   def test_north_america_custom_system_results(self):
     """