diff --git a/.drone.yml b/.drone.yml
index 809b9a7..f0662bd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,3 +6,9 @@ steps:
   image: gradle:jdk11
   commands:
   - gradle test
+  
+  - name: test-jdk8
+  image: gradle:jdk8
+  commands:
+  - gradle test
+
diff --git a/build.gradle b/build.gradle
index 00fd33c..5b1e63b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,4 +48,4 @@ compileTestKotlin {
 }
 
 group 'org.mosad'
-version '1.1.4'
+version '1.1.5'
diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
index 67d28be..b3ff778 100644
--- a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
@@ -158,11 +158,16 @@ class APIController {
      * if a timetable is requested update the request counter
      */
     private fun updateTimetableRequests(courseName: String) {
-        timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
-            it.requests++
-        }, {
-            timetableRequests.add(TimetableCounter(courseName, 1))
-        })
+        when (timetableRequests.stream().filter { x -> x.courseName == courseName }.findAny().orElse(null)) {
+            null -> timetableRequests.add(TimetableCounter(courseName, 0))
+        }
+        timetableRequests.stream().filter { x ->x.courseName == courseName }.findFirst().ifPresent { x -> x.requests++ }
+
+//        timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
+//            it.requests++
+//        }, {
+//
+//        })
     }
 
     private fun getStatus(): Status {