diff --git a/firmware/20230514_firmware.ino.bin b/firmware/20230514_firmware.ino.bin
new file mode 100644
index 0000000..5954163
Binary files /dev/null and b/firmware/20230514_firmware.ino.bin differ
diff --git a/firmware/20230514_firmware_dev.ino.bin b/firmware/20230514_firmware_dev.ino.bin
new file mode 100644
index 0000000..82e5a24
Binary files /dev/null and b/firmware/20230514_firmware_dev.ino.bin differ
diff --git a/firmware/firmware.ino b/firmware/firmware.ino
index 5bed69a..dc5ee91 100644
--- a/firmware/firmware.ino
+++ b/firmware/firmware.ino
@@ -87,10 +87,7 @@ void setup()
 
   SPIFFS.begin();
 
-#ifdef DEVELOPMENT
-  // Serial is not used in non development mode
   Serial.begin(SERIAL_BAUD_RATE);
-#endif
 
   Serial.flush();
   delay(1000);
diff --git a/firmware/timing_control.ino b/firmware/timing_control.ino
index f4a6c8d..5303783 100644
--- a/firmware/timing_control.ino
+++ b/firmware/timing_control.ino
@@ -165,14 +165,13 @@ void tc_update_main()
   // search for the current active time slot
   for (int i = NUMBER_OF_TIMER_DATA_BLOCKS-1; i >= 0 && target_data_block == 255; --i)
   {
-    //Serial.println((String)tc_data[i].hh + ":" + (String)tc_data[i].mm);
+    Serial.println((String)i + " - " + (String)tc_data[i].hh + ":" + (String)tc_data[i].mm);
 
-    if (tc_data[i].hh <= hour()    &&
-        tc_data[i].mm <= minute())
+    if (((tc_data[i].hh * 60) + tc_data[i].mm) <= ((hour() * 60) + minute()))
     {
-          target_data_block = i+1; // found the next block to load
+      target_data_block = i+1; // found the next block to load
+      Serial.println((String)i + " => " + target_data_block);
     }
-    //Serial.println((String)i + " => " + target_data_block);
   }
 
   if (target_data_block == 255)