diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index c0ccb036..6542aa85 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -459,6 +459,7 @@ void ObjectFactory::createSunSensorComponents(LinuxLibgpioIF* gpioComIF, SpiComI
   susHandler9->setToGoToNormalMode(true);
   susHandler10->setToGoToNormalMode(true);
   susHandler11->setToGoToNormalMode(true);
+#endif
 #if OBSW_DEBUG_SUS == 1
   susHandler0->enablePeriodicPrintout(true, 3);
   susHandler1->enablePeriodicPrintout(true, 3);
@@ -473,8 +474,6 @@ void ObjectFactory::createSunSensorComponents(LinuxLibgpioIF* gpioComIF, SpiComI
   susHandler10->enablePeriodicPrintout(true, 3);
   susHandler11->enablePeriodicPrintout(true, 3);
 #endif
-#endif
-
 #endif /* OBSW_ADD_SUN_SENSORS == 1 */
 }
 
@@ -1240,11 +1239,11 @@ void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF*
   static_cast<void>(plPcduHandler);
 #if OBSW_TEST_PL_PCDU == 1
   plPcduHandler->setStartUpImmediately();
+#endif
 #if OBSW_DEBUG_PL_PCDU == 1
   plPcduHandler->setToGoToNormalModeImmediately(true);
   plPcduHandler->enablePeriodicPrintout(true, 5);
 #endif
-#endif
 }
 
 void ObjectFactory::createTestComponents(LinuxLibgpioIF* gpioComIF) {