diff --git a/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java b/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java
index cbece431..2f637091 100644
--- a/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java
+++ b/api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java
@@ -88,6 +88,8 @@ public class Timetable {
     }
 
     private void addLessonDetails(Lesson lesson, Elements e) {
+        moveWarningToLessonNode(e);
+
         switch (e.size()) {
             case 1:
                 addLessonInfoFromElement(lesson, e.first());
@@ -104,6 +106,15 @@ public class Timetable {
         }
     }
 
+    private void moveWarningToLessonNode(Elements e) {
+        Elements warn = e.select(".uwaga-panel");
+
+        if (!warn.isEmpty()) {
+            e.select(".x-treelabel-rlz").last().text("(" + warn.text() + ")");
+            e.remove(1);
+        }
+    }
+
     private void addLessonInfoFromElement(Lesson lesson, Element e) {
         Elements spans = e.select("span");
 
diff --git a/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java b/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java
index ad7411e3..25b0362c 100644
--- a/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java
@@ -148,6 +148,7 @@ public class TimetableTest extends StudentAndParentTestCase {
         Assert.assertEquals("zastępstwo (poprzednio: Religia)", full.getWeekTable().getDay(2).getLesson(0).getDescription());
         Assert.assertEquals("zastępstwo (poprzednio: Wychowanie fizyczne)", full.getWeekTable().getDay(3).getLesson(1).getDescription());
         Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(0).getDescription());
+        Assert.assertEquals("egzamin", full.getWeekTable().getDay(3).getLesson(0).getDescription());
         Assert.assertEquals("", holidays.getWeekTable().getDay(3).getLesson(3).getDescription());
     }
 
diff --git a/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html b/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html
index f265067d..53eb0485 100644
--- a/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html
+++ b/api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html
@@ -52,7 +52,16 @@
                   <span class="x-treelabel-rlz">(zastępstwo)</span>
                 </div>
               </td>
-              <td></td>
+              <td>
+                <div>
+                  <span class="x-treelabel-ppl x-treelabel-inv">Język polski</span>
+                  <span class="x-treelabel-ppl x-treelabel-inv"> </span>
+                  <span class="x-treelabel-ppl x-treelabel-inv">16</span>
+                  <span class="x-treelabel-rlz">(oddział nieobecny)</span>
+                </div>
+                <button type="button" class="uwaga-btn">Uwaga</button>
+                <div class="uwaga-panel">egzamin</div>
+              </td>
               <td>
                 <div>
                   <span class="x-treelabel-ppl">Uroczyste zakończenie roku szkolnego</span>