diff --git a/fwdpp/ts/types/tree_sequence.hpp b/fwdpp/ts/types/tree_sequence.hpp
index 475fc9548..6eeebca71 100644
--- a/fwdpp/ts/types/tree_sequence.hpp
+++ b/fwdpp/ts/types/tree_sequence.hpp
@@ -43,11 +43,12 @@ namespace fwdpp
                 }
 
 #if __cplusplus >= 201703L
-                std::optional<const marginal_tree<SignedInteger>&>
+                std::optional<std::reference_wrapper<const marginal_tree<SignedInteger>>>
                 tree() const
                 {
                     // FIXME: should be nullopt if no more trees
-                    return std::optional<const marginal_tree<SignedInteger>&>{
+                    return std::optional<
+                        std::reference_wrapper<const marginal_tree<SignedInteger>>>{
                         std::cref(tree_)};
                 }
 #endif