diff --git a/include/matador/utils/thread_pool.hpp b/include/matador/utils/thread_pool.hpp
index 7754ff6..894283b 100644
--- a/include/matador/utils/thread_pool.hpp
+++ b/include/matador/utils/thread_pool.hpp
@@ -59,8 +59,8 @@ public:
    * @param args Passed arguments
    */
   template <typename F, typename... Args>
-  auto schedule(F&& func, Args&&... args) -> result_fut<std::result_of_t<F(cancel_token&, Args...)>> {
-    using return_type = std::result_of_t<F(cancel_token&, Args...)>;
+  auto schedule(F&& func, Args&&... args) -> result_fut<std::invoke_result_t<F, cancel_token&, Args...>> {
+    using return_type = std::invoke_result_t<F, cancel_token&, Args...>;
     const auto token = std::make_shared<cancel_token>();
 
     auto task_ptr = std::make_shared<std::packaged_task<return_type()>>(
@@ -73,7 +73,7 @@ public:
       if (!running_) {
           return failure(std::string("Thread pool is shut down, cannot schedule new tasks."));
       }
-      tasks_.emplace_back([task_ptr, token] {
+      tasks_.emplace_back([task_ptr] {
           try { (*task_ptr)(); }
           catch (...) { /* Prevent exception escape */ }
       }, token);