diff --git a/src/NotificationRequestPool.h b/src/NotificationRequestPool.h
index 026f30a..c544cb9 100644
--- a/src/NotificationRequestPool.h
+++ b/src/NotificationRequestPool.h
@@ -9,12 +9,11 @@
 #include "ViGEm/Client.h"
 #include "Internal.h"
 
-#define VIGEM_INVERTED_CALL_THREAD_COUNT    20
-
 
 class NotificationRequestPool
 {
-    HANDLE wait_handles_[VIGEM_INVERTED_CALL_THREAD_COUNT]{};
+    static const int thread_count = 20;
+    HANDLE wait_handles_[thread_count]{};
 
     PVIGEM_CLIENT client_;
     PVIGEM_TARGET target_;
diff --git a/src/ViGEmClient.cpp b/src/ViGEmClient.cpp
index 8e42093..f2a37e5 100644
--- a/src/ViGEmClient.cpp
+++ b/src/ViGEmClient.cpp
@@ -531,7 +531,7 @@ VIGEM_ERROR vigem_target_ds4_register_notification(
 
     std::vector<std::thread> threadList;
 
-    for (int i = 0; i < VIGEM_INVERTED_CALL_THREAD_COUNT; i++)
+    for (int i = 0; i < 20 /* TODO: legacy, remove */; i++)
     {
         threadList.emplace_back(std::thread([](
             PVIGEM_TARGET _Target,