diff --git a/BAC0/core/functions/Schedule.py b/BAC0/core/functions/Schedule.py
index de04e5f9..15b490b1 100644
--- a/BAC0/core/functions/Schedule.py
+++ b/BAC0/core/functions/Schedule.py
@@ -109,7 +109,7 @@ def _set_value(v):
                 if dict_schedule["states"] == ["inactive", "active"]:
                     return Integer(dict_schedule["states"][v])
                 else:
-                    return Integer(dict_schedule["states"][v] - 1)
+                    return Enumerated(dict_schedule["states"][v] - 1)
 
         daily_schedules = []
         for day in Schedule.days:
diff --git a/BAC0/core/proprietary_objects/jci.py b/BAC0/core/proprietary_objects/jci.py
index 71545a03..15e9b3b6 100644
--- a/BAC0/core/proprietary_objects/jci.py
+++ b/BAC0/core/proprietary_objects/jci.py
@@ -349,8 +349,8 @@ def tec_short_point_list(unit_type="2-pipe"):
         ("multiStateValue", 29709),
         ("multiStateValue", 29708),
         ("analogValue", 29505),
-        ("analogValue", 29502),
-        ("analogValue", 29503),
+        # ("analogValue", 29502),
+        # ("analogValue", 29503),
         ("analogValue", 29504),
         ("analogValue", 29506),
         ("analogValue", 29507),
diff --git a/BAC0/infos.py b/BAC0/infos.py
index 3e0bbe62..85a8222d 100644
--- a/BAC0/infos.py
+++ b/BAC0/infos.py
@@ -12,5 +12,5 @@
 __email__ = "christian.tremblay@servisys.com"
 __url__ = "https://github.com/ChristianTremblay/BAC0"
 __download_url__ = "https://github.com/ChristianTremblay/BAC0/archive/master.zip"
-__version__ = "21.12.03"
+__version__ = "22.01.06dev"
 __license__ = "LGPLv3"