diff --git a/fsfw b/fsfw
index d0607824..43fd0b2f 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit d0607824ad551771e4e3ec1f1752f5f2f6a1a7a8
+Subproject commit 43fd0b2f59c3aeb2d3f4db10cfad56ee3709d68d
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 8bf4eff6..53ca6904 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -112,8 +112,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
   }
 
   {
-    PoolManager::LocalPoolConfig poolCfg = {{600, 32},   {400, 64},   {400, 128}, {300, 512},
-                                            {250, 1024}, {150, 2048}};
+    PoolManager::LocalPoolConfig poolCfg = {{600, 32},  {400, 64},   {400, 128},
+                                            {300, 512}, {250, 1024}, {150, 2048}};
     *tmStore = new PoolManager(objects::TM_STORE, poolCfg);
   }
 
@@ -254,8 +254,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
                                    pus::PUS_SERVICE_20);
   new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, config::EIVE_PUS_APID,
                                 pus::PUS_SERVICE_200, 8);
-  HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID, *healthTable,
-                             20);
+  HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID,
+                             objects::HEALTH_TABLE, 20);
   new CServiceHealthCommanding(healthCfg);
 
 #if OBSW_ADD_CFDP_COMPONENTS == 1