diff --git a/app/src/main/java/com/schoolapp/cleverclass/TimeTableSetupActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/TimeTableSetupActivity.kt
index 0860568..0f30f52 100644
--- a/app/src/main/java/com/schoolapp/cleverclass/TimeTableSetupActivity.kt
+++ b/app/src/main/java/com/schoolapp/cleverclass/TimeTableSetupActivity.kt
@@ -492,7 +492,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
                                     lessons = lessons + LessonData("", "", "")
                                 }
                                 while (currentLessonAmount.toInt() < lessons.size) {
-                                    lessons = lessons.drop(1)
+                                    lessons = lessons.dropLast(1)
                                 }
 
                                 lessons.forEachIndexed { index, lessonData ->
@@ -555,6 +555,7 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
                                         colors = inputFieldColors,
                                     )
                                 }
+                                saveLessonsUsage(activity, lessons, state)
                             }
                             //save an empty list into DataStore currentLessonAmount == 0
                             else {