diff --git a/src/MassManager/MassManager.cpp b/src/MassManager/MassManager.cpp
index 9a82735..473bf8f 100644
--- a/src/MassManager/MassManager.cpp
+++ b/src/MassManager/MassManager.cpp
@@ -29,12 +29,10 @@ MassManager::MassManager(Containers::StringView save_path, Containers::StringVie
     _demo{demo},
     _stagingAreaDirectory{staging_dir}
 {
-    Containers::arrayReserve(_hangars, 32);
-
     Containers::String mass_filename = "";
-    for(int i = 0; i < 32; i++) {
+    for(UnsignedInt i = 0; i < _hangars.size(); i++) {
         mass_filename = Utility::Path::join(_saveDirectory, Utility::format("{}Unit{:.2d}{}.sav", demo ? "Demo"_s : ""_s, i, _account));
-        Containers::arrayAppend(_hangars, Mass{mass_filename});
+        new(&_hangars[i]) Mass{mass_filename};
     }
 
     if(!Utility::Path::exists(_stagingAreaDirectory)) {
diff --git a/src/MassManager/MassManager.h b/src/MassManager/MassManager.h
index ccda973..caa9c39 100644
--- a/src/MassManager/MassManager.h
+++ b/src/MassManager/MassManager.h
@@ -18,7 +18,7 @@
 
 #include <map>
 
-#include <Corrade/Containers/GrowableArray.h>
+#include <Corrade/Containers/StaticArray.h>
 #include <Corrade/Containers/String.h>
 #include <Corrade/Containers/StringView.h>
 
@@ -53,7 +53,7 @@ class MassManager {
 
         Containers::String _lastError;
 
-        Containers::Array<Mass> _hangars;
+        Containers::StaticArray<32, Mass> _hangars{NoInit};
 
         Containers::StringView _stagingAreaDirectory;