diff --git a/ampel-firmware/sensor_commands.cpp b/ampel-firmware/sensor_commands.cpp
index b61cc8f1c7709f4ba5dadd2e39ebaf49adf05324..6a2ba85b51b4f32052cfab9e5452c1177c154a5a 100644
--- a/ampel-firmware/sensor_commands.cpp
+++ b/ampel-firmware/sensor_commands.cpp
@@ -5,6 +5,7 @@ namespace sensor_commands {
   const uint8_t MAX_COMMAND_SIZE = 30;
 
   uint8_t callbacks_count = 0;
+  //TODO: Add example? Add description?
   struct Callback {
     Callback(const char *s = 0, void (*f)(int32_t) = 0) :
         name(s), function(f) {
@@ -57,22 +58,19 @@ namespace sensor_commands {
   }
 
   void listAvailableCallbacks() {
-    Serial.println("DEBUG - Available commands :");
+    Serial.println(F("Message not supported. Doing nothing. Available commands :"));
     for (uint8_t i = 0; i < callbacks_count; i++) {
       Serial.print("  ");
-      Serial.println(callbacks[i].name);
+      Serial.print(callbacks[i].name);
+      Serial.println(" 1234");
     }
     led_effects::showKITTWheel(color::red, 1);
-    Serial.println(F("Message not supported. Doing nothing."));
   }
 
   void run(const char *command) {
     char function_name[MAX_COMMAND_SIZE];
     int32_t parameter;
-    if (parseCommand(command, function_name, parameter)) {
-      listAvailableCallbacks();
-      return;
-    }
+    parseCommand(command, function_name, parameter);
 
     for (uint8_t i = 0; i < callbacks_count; i++) {
       if (!strcmp(function_name, callbacks[i].name)) {
diff --git a/ampel-firmware/web_server.h b/ampel-firmware/web_server.h
index 71c17f0578ac1616f464d0456f25afcfa5930c72..4f2731e066657a18e5b51a0e81c479b4665c9aa7 100644
--- a/ampel-firmware/web_server.h
+++ b/ampel-firmware/web_server.h
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "util.h"
 #include "co2_sensor.h"
+#include "sensor_commands.h"
 #ifdef AMPEL_CSV
 #  include "csv_writer.h"
 #endif