diff --git a/include/chaiscript/dispatchkit/handle_return.hpp b/include/chaiscript/dispatchkit/handle_return.hpp
index aeee80e4..b5609ef4 100644
--- a/include/chaiscript/dispatchkit/handle_return.hpp
+++ b/include/chaiscript/dispatchkit/handle_return.hpp
@@ -36,14 +36,14 @@ namespace chaiscript
         struct Handle_Return
         {
           template<typename T,
-                   typename = std::enable_if_t<std::is_pod_v<std::decay_t<T>>>>
+                   typename = typename std::enable_if_t<std::is_trivial_v<typename std::decay_t<T>>>>
           static Boxed_Value handle(T r)
           {
             return Boxed_Value(std::move(r), true);
           }
 
           template<typename T,
-                   typename = std::enable_if_t<!std::is_pod_v<std::decay_t<T>>>>
+                   typename = typename std::enable_if_t<!(std::is_trivial_v<typename std::decay_t<T>>)>>
           static Boxed_Value handle(T &&r)
           {
             return Boxed_Value(std::make_shared<T>(std::forward<T>(r)), true);