diff --git a/art/seafire/common/invoke.hxx b/art/seafire/common/invoke.hxx
index 50866eb..f70a2c7 100644
--- a/art/seafire/common/invoke.hxx
+++ b/art/seafire/common/invoke.hxx
@@ -8,41 +8,41 @@ namespace art::seafire::common
 {
 
   template<typename Ret, typename T, typename... Direct, typename... Params>
-  Ret
+  decltype(auto)
   do_invoke(T& target,
             server::request_t& req,
             Direct const&... direct,
             Ret (T::*func)(Direct const&..., Params const&...));
 
   template<typename Ret, typename T, typename... Params, typename... Direct>
-  Ret
+  decltype(auto)
   invoke(T& target,
          server::request_t& req,
          Ret (T::*func)(Params const&...),
          Direct const&... direct);
 
   template<typename Ret, typename T, typename... Direct, typename... Params>
-  Ret
+  decltype(auto)
   do_invoke(T const& target,
             server::request_t& req,
             Direct const&... direct,
             Ret (T::*func)(Direct const&..., Params const&...) const);
 
   template<typename Ret, typename T, typename... Params, typename... Direct>
-  Ret
+  decltype(auto)
   invoke(T const& target,
          server::request_t& req,
          Ret (T::*func)(Params const&...) const,
          Direct const&... direct);
 
   template<typename Ret, typename... Direct, typename... Params>
-  Ret
+  decltype(auto)
   do_invoke(server::request_t& req,
             Direct&&... direct,
             Ret (*func)(Direct..., Params...));
 
   template<typename Ret, typename... Params, typename... Direct>
-  Ret
+  decltype(auto)
   invoke(server::request_t& req,
          Ret (*func)(Params...),
          Direct&&... direct);
diff --git a/art/seafire/common/invoke.txx b/art/seafire/common/invoke.txx
index 29b5d8e..3dc820b 100644
--- a/art/seafire/common/invoke.txx
+++ b/art/seafire/common/invoke.txx
@@ -2,7 +2,7 @@ namespace art::seafire::common
 {
 
   template<typename Ret, typename T, typename... Direct, typename... Params>
-  Ret
+  decltype(auto)
   do_invoke(T& target,
             server::request_t& req,
             Direct const&... direct,
@@ -12,7 +12,7 @@ namespace art::seafire::common
   }
 
   template<typename Ret, typename T, typename... Params, typename... Direct>
-  Ret
+  decltype(auto)
   invoke(T& target,
          server::request_t& req,
          Ret (T::*func)(Params const&...),
@@ -22,7 +22,7 @@ namespace art::seafire::common
   }
 
   template<typename Ret, typename T, typename... Direct, typename... Params>
-  Ret
+  decltype(auto)
   do_invoke(T const& target,
             server::request_t& req,
             Direct const&... direct,
@@ -32,7 +32,7 @@ namespace art::seafire::common
   }
 
   template<typename Ret, typename T, typename... Params, typename... Direct>
-  Ret
+  decltype(auto)
   invoke(T const& target,
          server::request_t& req,
          Ret (T::*func)(Params const&...) const,
@@ -42,7 +42,7 @@ namespace art::seafire::common
   }
 
   template<typename Ret, typename... Direct, typename... Params>
-  Ret
+  decltype(auto)
   do_invoke(server::request_t& req,
             Direct&&... direct,
             Ret (*func)(Direct..., Params...))
@@ -51,7 +51,7 @@ namespace art::seafire::common
   }
 
   template<typename Ret, typename... Params, typename... Direct>
-  Ret
+  decltype(auto)
   invoke(server::request_t& req,
          Ret (*func)(Params...),
          Direct&&... direct)