diff --git a/src/optional.hh b/src/optional.hh
index e9386fa8..81dd15cf 100644
--- a/src/optional.hh
+++ b/src/optional.hh
@@ -95,7 +95,7 @@ public:
     template<typename U> using DecayOptional = typename DecayOptionalImpl<U>::Type;
 
     template<typename F>
-    auto map(F f) -> Optional<DecayOptional<decltype(f(std::declval<T&&>()))>>
+    auto map(F f) -> Optional<DecayOptional<decltype(f(std::declval<T>()))>>
     {
         if (not m_valid)
             return {};