diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 8229536b..a84e314f 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -598,7 +598,7 @@ void ObjectFactory::produce(void* args){
     rw1SpiCookie->setCallbackArgs(rwHandler1);
 
     auto rwHandler2 = new RwHandler(objects::RW2, objects::SPI_COM_IF, rw2SpiCookie, gpioComIF,
-			gpioIds::EN_RW1);
+			gpioIds::EN_RW2);
     rwHandler2->setStartUpImmediately();
     rw2SpiCookie->setCallbackArgs(rwHandler2);
 
diff --git a/tmtc b/tmtc
index 19b76d96..10ea97ff 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 19b76d961c61966a0093d3768f62d99196e1c9b2
+Subproject commit 10ea97ff0b685014f8f79b124edc8009db6fd879