diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/devices/ScexDeviceHandler.cpp
index 5cc11d7c..edd9e6e9 100644
--- a/mission/devices/ScexDeviceHandler.cpp
+++ b/mission/devices/ScexDeviceHandler.cpp
@@ -84,7 +84,7 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
       break;
     }
     case (FRAM): {
-      finishCountdown.setTimeout(SHORT_CD);
+      finishCountdown.setTimeout(LONG_CD);
       // countdown starten
       finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
@@ -123,11 +123,11 @@ void ScexDeviceHandler::fillCommandAndReplyMap() {
   insertInCommandAndReplyMap(scex::Cmds::EXP_STATUS_CMD, 3);
 
   insertInCommandAndReplyMap(scex::Cmds::ALL_CELLS_CMD, 0, nullptr, 0, false, false,
-      DeviceHandlerIF::UNKNOWN_DEVICE_REPLY, &finishCountdown);
+      scex::Cmds::ALL_CELLS_CMD, &finishCountdown);
   insertInCommandAndReplyMap(scex::Cmds::ONE_CELL, 0, nullptr, 0, false, false,
-      DeviceHandlerIF::UNKNOWN_DEVICE_REPLY, &finishCountdown);
+      scex::Cmds::ONE_CELL, &finishCountdown);
   insertInCommandAndReplyMap(scex::Cmds::FRAM, 0, nullptr, 0, false, false,
-      DeviceHandlerIF::UNKNOWN_DEVICE_REPLY, &finishCountdown);
+      scex::Cmds::FRAM, &finishCountdown);
 
   insertInReplyMap(scex::Cmds::ERROR_REPLY, 3);
 }
diff --git a/tmtc b/tmtc
index 0a655f51..937eb482 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 0a655f51d4803d5561911101823e611d1f4a19ad
+Subproject commit 937eb4829883b17e3a7a842528675c3609e24768