diff --git a/biscuit/apps/untis/api.py b/biscuit/apps/untis/api.py
index 45a36033a8c87be5e5f883dca35ba29be6515f09..d903d5dd6923a95bbf3152f2955ae343123e7dd3 100755
--- a/biscuit/apps/untis/api.py
+++ b/biscuit/apps/untis/api.py
@@ -290,8 +290,8 @@ class Absence(object):
 
     def create(self, db_obj):
         self.filled = True
-        print(db_obj.ida)
-        print(db_obj.typea)
+        # print(db_obj.ida)
+        # print(db_obj.typea)
         if db_obj.typea == 101:
             self.type = TYPE_TEACHER
         elif db_obj.typea == 100:
@@ -300,7 +300,7 @@ class Absence(object):
             self.type = TYPE_ROOM
 
         if self.type == TYPE_TEACHER:
-            print("IDA", db_obj.ida)
+            # print("IDA", db_obj.ida)
             self.teacher = get_teacher_by_id(db_obj.ida)
         else:
             self.room = get_room_by_id(db_obj.ida)
diff --git a/biscuit/apps/untis/events.py b/biscuit/apps/untis/events.py
index 8b9166376373c411d0d24aef163fd7cc94924948..66f76c6c1b0605363e3d4f0e0ee7adc7b6e5d3e8 100644
--- a/biscuit/apps/untis/events.py
+++ b/biscuit/apps/untis/events.py
@@ -53,7 +53,7 @@ class Event(object):
                 self.rooms.append(obj)
 
             if element[4] != "0" and element[4] != "":
-                print(element[4])
+                # print(element[4])
                 try:
                     absence_id = int(element[4])
                     absence = get_absence_by_id(absence_id)
diff --git a/biscuit/apps/untis/sub.py b/biscuit/apps/untis/sub.py
index fecb3ccf5480827452890884b9aa3b5fa1f9b845..a51afdc1c00d586055b82666e218666f5817ce0d 100644
--- a/biscuit/apps/untis/sub.py
+++ b/biscuit/apps/untis/sub.py
@@ -331,6 +331,10 @@ def get_substitutions_by_date_as_dict(date):
     for i, sub_raw in enumerate(subs_raw):
         if sub_raw.lesson_id not in subs.keys():
             subs[sub_raw.lesson_id] = []
-        subs[sub_raw.lesson_id].append({"sub": sub_raw, "table": sub_table[i]})
+        sub_row = None
+        for sub_item in sub_table:
+            if sub_item.sub.id == sub_raw.id:
+                sub_row = sub_item
+        subs[sub_raw.lesson_id].append({"sub": sub_raw, "table": sub_row})
 
     return subs