diff --git a/mission/devices/TestDeviceHandler.cpp b/mission/devices/TestDeviceHandler.cpp
index 5403c57..0a1e6ca 100644
--- a/mission/devices/TestDeviceHandler.cpp
+++ b/mission/devices/TestDeviceHandler.cpp
@@ -580,7 +580,7 @@ ReturnValue_t TestDevice::interpretingTestReply0(DeviceCommandId_t id, const uin
 #endif
     }
 
-    MessageQueueId_t commander = getCommanderId(id);
+    MessageQueueId_t commander = getCommanderQueueId(id);
     /* Generate one step reply and the finish reply */
     actionHelper.step(1, commander, id);
     actionHelper.finish(true, commander, id);
@@ -600,7 +600,7 @@ ReturnValue_t TestDevice::interpretingTestReply1(DeviceCommandId_t id,
 #endif
     }
 
-    MessageQueueId_t commander = getCommanderId(id);
+    MessageQueueId_t commander = getCommanderQueueId(id);
     /* Send reply with data */
     ReturnValue_t result = actionHelper.reportData(commander, id, packet,
             testdevice::TEST_COMMAND_1_SIZE, false);