diff --git a/container/StaticFIFO.h b/container/StaticFIFO.h
index 651c4989b..780b0383b 100644
--- a/container/StaticFIFO.h
+++ b/container/StaticFIFO.h
@@ -3,6 +3,7 @@
 
 #include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <framework/container/FIFOBase.h>
+#include <array>
 
 /**
  * @brief 	Simple First-In-First-Out data structure with size fixed at
diff --git a/tmtcservices/CommandingServiceBase.h b/tmtcservices/CommandingServiceBase.h
index bf2e82423..b3132be55 100644
--- a/tmtcservices/CommandingServiceBase.h
+++ b/tmtcservices/CommandingServiceBase.h
@@ -2,7 +2,7 @@
 #define COMMANDINGSERVICEBASE_H_
 
 #include <framework/container/FixedMap.h>
-#include <framework/container/FIFO.h>
+#include <framework/container/StaticFIFO.h>
 #include <framework/ipc/CommandMessage.h>
 #include <framework/objectmanager/ObjectManagerIF.h>
 #include <framework/objectmanager/SystemObject.h>
@@ -179,7 +179,7 @@ protected:
 		uint32_t state;
 		Command_t command;
 		object_id_t objectId;
-		FIFO<store_address_t, 3> fifo;
+		StaticFIFO<store_address_t, 3> fifo;
 	};
 
 	const uint16_t apid;