diff --git a/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.cpp b/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.cpp
index f2c8d1f4..8db80b91 100644
--- a/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.cpp
+++ b/Source/lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.cpp
@@ -885,7 +885,13 @@ void LumatoneFirmwareDriver::sendCurrentMessage()
     sendMessageNow(currentMsgWaitingForAck);        // send it
 
     // Notify listeners
-    DBG("SENT: " + currentMsgWaitingForAck.getDescription());
+    #if JUCE_DEBUG
+    {
+        juce::String msg = "SENT: " + FirmwareSupport::getCommandDescription(currentMsgWaitingForAck);
+        // DBG("SENT: " + currentMsgWaitingForAck.getDescription());
+        DBG(msg);
+    }
+    #endif
     // const juce::MessageManagerLock mmLock;
     // this->listeners.call(&Listener::midiMessageSent, currentMsgWaitingForAck);
     // notifyMessageSent(midiOutput, currentMsgWaitingForAck);
@@ -899,10 +905,11 @@ void LumatoneFirmwareDriver::handleIncomingMidiMessage(juce::MidiInput* source,
 #if JUCE_DEBUG
     if (message.isSysEx())
     {
+        auto msg = "RCVD: " + FirmwareSupport::getCommandDescription(message);
         if (source)
-            DBG("RCVD: " + message.getDescription() + "; from " + source->getName());
+            DBG(msg + "; from " + source->getName());
         else
-            DBG("RCVD: " + message.getDescription() + "; called by processor");
+            DBG(msg + "; called by processor");
     }
     if (!message.isSysEx() && !message.isMidiClock())
     {