diff --git a/.idea/misc.xml b/.idea/misc.xml
index e4b2b0ee..15ef006b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -50,7 +50,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt
index 682689d0..41b761ac 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt
@@ -96,9 +96,9 @@ class LessonFull(profileId: Int, id: Long) : Lesson(profileId, id) {
         }
 
         return when (second) {
-            null -> first ?: ""
+            null -> first.orEmpty()
             first -> second
-            else -> "$first -> $second"
+            else -> if (first != null) "$first -> $second" else second.orEmpty()
         }
     }