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 77ca41bd6..3aaebf6bd 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
@@ -98,8 +98,10 @@ public class Timetable {
                 addLessonInfoFromElement(lesson, e.first());
                 break;
             case 2:
-                Element span = e.last().select("span").first();
-                if (span.hasClass(LessonTypes.CLASS_MOVED_OR_CANCELED)) {
+                Element span = e.last().selectFirst("span");
+                if (null == span) {
+                    addLessonInfoFromElement(lesson, e.first());
+                } else if (span.hasClass(LessonTypes.CLASS_MOVED_OR_CANCELED)) {
                     lesson.setNewMovedInOrChanged(true);
                     lesson.setDescription("poprzednio: " + getLessonAndGroupInfoFromSpan(span)[0]);
                     addLessonInfoFromElement(lesson, e.first());
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 8939b10fd..b517436b9 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
@@ -105,6 +105,7 @@ public class TimetableTest extends StudentAndParentTestCase {
         Assert.assertEquals("Zajęcia techniczne", std.getWeekTable().getDay(2).getLesson(4).getSubject());
         Assert.assertEquals("Wychowanie fizyczne", std.getWeekTable().getDay(1).getLesson(1).getSubject());
         Assert.assertEquals("Język angielski", full.getWeekTable().getDay(0).getLesson(1).getSubject());
+        Assert.assertEquals("Wychowanie fizyczne", full.getWeekTable().getDay(0).getLesson(9).getSubject());
         Assert.assertEquals("Wychowanie do życia w rodzinie", full.getWeekTable().getDay(2).getLesson(0).getSubject());
         Assert.assertEquals("Wychowanie fizyczne", full.getWeekTable().getDay(3).getLesson(1).getSubject());
         Assert.assertEquals("Uroczyste zakończenie roku szkolnego", full.getWeekTable().getDay(4).getLesson(0).getSubject());
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 4bce6c935..14026d8fb 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
@@ -461,7 +461,18 @@
             <tr>
               <td>9</td>
               <td>14:50 15:35</td>
-              <td></td>
+              <td>
+                <div>
+                  <span class="x-treelabel-ppl x-treelabel-zas">Wychowanie fizyczne [zaw2]</span>
+                  <span class="x-treelabel-ppl x-treelabel-zas"></span>
+                  <span class="x-treelabel-ppl x-treelabel-zas"></span>
+                  <span class="x-treelabel-ppl x-treelabel-zas">G3</span>
+                  <span class="x-treelabel-rlz">(przeniesiona z lekcji 7, 01.12.2017)</span>
+                </div>
+                <div>
+                  <!--<span>WTF</span>-->
+                </div>
+              </td>
               <td>
                 <div>
                   <span class="x-treelabel-ppl x-treelabel-inv">Język niemiecki [J1]</span>