diff --git a/include/matador/orm/session.hpp b/include/matador/orm/session.hpp
index 8c7991a..851ce52 100644
--- a/include/matador/orm/session.hpp
+++ b/include/matador/orm/session.hpp
@@ -328,7 +328,7 @@ utils::result<object::object_ptr<Type>, utils::error> session::find(const Primar
                                      "Failed to build query for type " + info.name() + "."));
   }
 
-  auto res = build_select_query(data.release()).prepare(*this);
+  auto res = data->prepare(*this);
 
   if (!res) {
     return utils::failure(res.err());
@@ -357,7 +357,7 @@ utils::result<sql::query_result<Type>, utils::error> session::find(query::criter
                                      "Failed to build query for type " + it->second.name() + "."));
   }
 
-  auto result = build_select_query(data.release()).prepare(*this);
+  auto result = data->prepare(*this);
   if (!result.is_ok()) {
     return utils::failure(result.err());
   }