diff --git a/Source/Contents/Async/AsyncWorkRecycleObjectPoolMgr.cpp b/Source/Contents/Async/AsyncWorkRecycleObjectPoolMgr.cpp
index 03782740..e1806ab5 100644
--- a/Source/Contents/Async/AsyncWorkRecycleObjectPoolMgr.cpp
+++ b/Source/Contents/Async/AsyncWorkRecycleObjectPoolMgr.cpp
@@ -13,7 +13,7 @@
 #include "Contents/Party/RegisterPartyAsyncWork.h"
 #include "Contents/Party/StopRecruitingAsyncWork.h"
 
-#include <memory>
+#include <utility>
 #include <new>
 
 // OFFSET: 0x00576660
@@ -34,24 +34,47 @@ CAsyncWorkRecycleObjectPoolMgr::~CAsyncWorkRecycleObjectPoolMgr() {
 // OFFSET: 0x00578F30
 // FUNCTION: fn_02566
 bool CAsyncWorkRecycleObjectPoolMgr::RegisterPools() {
-  const auto insert = [&]<class T>(const char* name) {
-    std::unique_ptr<NRecycleObjectPoolInter> pool(new (std::nothrow) NRecycleObjectPool<T>(2));
-    if (!this->m_pools.emplace(name, pool.get()).second) {
-      return false;
-    }
-
-    (void) pool.release();
-    return true;
-  };
-
-  return insert.operator()<CAccountLinkedUserDataLoadAsyncWork>("AccountLinkedUserData_Load") &&
-         insert.operator()<CAccountLinkedUserDataSaveAsyncWork>("AccountLinkedUserData_Save") &&
-         insert.operator()<CCharacterLinkedUserDataLoadAsyncWork>("CharacterLinkedUserData_Load") &&
-         insert.operator()<CCharacterLinkedUserDataSaveAsyncWork>("CharacterLinkedUserData_Save") &&
-         insert.operator()<CEmblemDataUploadAsyncWork>("Emblem_Upload") && insert.operator()<CEmblemDataDownloadAsyncWork>("Emblem_Download") &&
-         insert.operator()<CMCStoreInfoBackupLoadAsyncWork>("MerchantStoreInformation_Load") &&
-         insert.operator()<CMCStoreInfoBackupSaveAsyncWork>("MerchantStoreInformation_Save") && insert.operator()<CLoadPartyListAsyncWork>("PartyList_Load") &&
-         insert.operator()<CLoadMyPartyAsyncWork>("MyParty_Load") && insert.operator()<CRegisterPartyAsyncWork>("Register_Party") &&
-         insert.operator()<CStopRecruitingAsyncWork>("Stop_Recruiting") && insert.operator()<CChangePartyMasterAsyncWork>("Change_PartyMaster") &&
-         insert.operator()<CLoadPartyInfoAsyncWork>("PartyInfo_Load");
+  if (!this->m_pools.insert(std::make_pair("AccountLinkedUserData_Load", new (std::nothrow) NRecycleObjectPool<CAccountLinkedUserDataLoadAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("AccountLinkedUserData_Save", new (std::nothrow) NRecycleObjectPool<CAccountLinkedUserDataSaveAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("CharacterLinkedUserData_Load", new (std::nothrow) NRecycleObjectPool<CCharacterLinkedUserDataLoadAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("CharacterLinkedUserData_Save", new (std::nothrow) NRecycleObjectPool<CCharacterLinkedUserDataSaveAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("Emblem_Upload", new (std::nothrow) NRecycleObjectPool<CEmblemDataUploadAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("Emblem_Download", new (std::nothrow) NRecycleObjectPool<CEmblemDataDownloadAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("MerchantStoreInformation_Load", new (std::nothrow) NRecycleObjectPool<CMCStoreInfoBackupLoadAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("MerchantStoreInformation_Save", new (std::nothrow) NRecycleObjectPool<CMCStoreInfoBackupSaveAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("PartyList_Load", new (std::nothrow) NRecycleObjectPool<CLoadPartyListAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("MyParty_Load", new (std::nothrow) NRecycleObjectPool<CLoadMyPartyAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("Register_Party", new (std::nothrow) NRecycleObjectPool<CRegisterPartyAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("Stop_Recruiting", new (std::nothrow) NRecycleObjectPool<CStopRecruitingAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("Change_PartyMaster", new (std::nothrow) NRecycleObjectPool<CChangePartyMasterAsyncWork>(2))).second) {
+    return false;
+  }
+  if (!this->m_pools.insert(std::make_pair("PartyInfo_Load", new (std::nothrow) NRecycleObjectPool<CLoadPartyInfoAsyncWork>(2))).second) {
+    return false;
+  }
+  return true;
 }
diff --git a/Source/Utility/Async/NRecycleObject.h b/Source/Utility/Async/NRecycleObject.h
index 4c6f29eb..f3151482 100644
--- a/Source/Utility/Async/NRecycleObject.h
+++ b/Source/Utility/Async/NRecycleObject.h
@@ -41,7 +41,8 @@ template <class T> class NRecycleObjectPool : public NRecycleObjectPoolInter {
 public:
   // OFFSET: 0x00575AC0
   // FUNCTION: fn_02529
-  explicit NRecycleObjectPool(std::uint32_t minimumFree) : m_enabled(false), m_minimumFree(minimumFree) {
+  explicit NRecycleObjectPool(std::uint32_t minimumFree) : m_minimumFree(minimumFree) {
+    this->m_enabled = false;
     InitializeCriticalSection(&this->m_criticalSection);
     this->m_enabled = true;
   }
@@ -85,18 +86,17 @@ public:
   T* Acquire() override {
     NSyncObject held(&this->m_criticalSection);
     T* object;
-    if (this->m_free.size() >= this->m_minimumFree) {
+    if (this->m_free.size() < this->m_minimumFree) {
+      object = new (std::nothrow) T;
+      if (object == nullptr) {
+        return nullptr;
+      }
+      this->m_objects.push_back(object);
+    } else {
       object = this->m_free.front();
       this->m_free.pop_front();
-    } else {
-      object = new (std::nothrow) T;
-      if (object) {
-        this->m_objects.push_back(object);
-      }
-    }
-    if (object) {
-      object->Reset();
     }
+    object->Reset();
     return object;
   }
 
@@ -133,8 +133,7 @@ public:
     if (object) {
       auto owned = std::find(this->m_objects.begin(), this->m_objects.end(), object);
       if (owned != this->m_objects.end()) {
-
-        this->m_free.push_back(*owned);
+        this->m_free.push_back(static_cast<T*>(object));
       }
     }
   }