diff --git a/container/FIFO.h b/container/FIFO.h
index 7251321f..19daaf1b 100644
--- a/container/FIFO.h
+++ b/container/FIFO.h
@@ -19,10 +19,8 @@ namespace fsfw {
 template<typename T>
 class FIFO: public FIFOBase<T> {
 public:
-	FIFO(size_t maxCapacity): FIFOBase<T>(values.data(), maxCapacity) {
-		values.reserve(maxCapacity);
-		values.resize(maxCapacity);
-	};
+	FIFO(size_t maxCapacity): FIFOBase<T>(values.data(), maxCapacity),
+			values(maxCapacity) {};
 
 private:
 	std::vector<T> values;
diff --git a/container/FIFOBase.h b/container/FIFOBase.h
index ac5c6e2c..6ed7d924 100644
--- a/container/FIFOBase.h
+++ b/container/FIFOBase.h
@@ -45,9 +45,11 @@ public:
 	bool full();
 	size_t size();
 
+	size_t getMaxCapacity() const;
+
 private:
 	T* values;
-	size_t maxCapacity;
+	size_t maxCapacity = 0;
 
 	size_t readIndex = 0;
 	size_t writeIndex = 0;
diff --git a/container/FIFOBase.tpp b/container/FIFOBase.tpp
index 011ce6de..48a060ff 100644
--- a/container/FIFOBase.tpp
+++ b/container/FIFOBase.tpp
@@ -73,4 +73,9 @@ inline size_t FIFOBase<T>::next(size_t current) {
 	return current;
 }
 
+template<typename T>
+inline size_t FIFOBase<T>::getMaxCapacity() const {
+	return maxCapacity;
+}
+
 #endif