diff --git a/tuple/value.hpp b/tuple/value.hpp
index 978cd981..1028a54c 100644
--- a/tuple/value.hpp
+++ b/tuple/value.hpp
@@ -46,7 +46,9 @@ namespace cruft::tuple::value {
         auto
         map (std::index_sequence<Indices...>, FuncT &&func, ArgT &&arg)
         {
-            return std::tuple (std::invoke (func, std::get<Indices> (arg))...);
+            return std::tuple (
+                std::invoke (func, std::get<Indices> (arg))...
+            );
         }
     };
 
@@ -62,7 +64,11 @@ namespace cruft::tuple::value {
     >
     auto map (FuncT &&func, ArgT &&arg)
     {
-        return detail::map (IndicesV{}, func, arg);
+        return detail::map (
+            IndicesV{},
+            std::forward<FuncT> (func),
+            std::forward<ArgT>  (arg)
+        );
     }