diff --git a/include/sqlpp11/having.h b/include/sqlpp11/having.h
index 68e41349..4e768845 100644
--- a/include/sqlpp11/having.h
+++ b/include/sqlpp11/having.h
@@ -314,9 +314,9 @@ namespace sqlpp
 
   template <typename Database, typename T>
   auto dynamic_having(const Database&, T&& t)
-      -> decltype(statement_t<void, no_having_t>().dynamic_having(std::forward<T>(t)))
+      -> decltype(statement_t<Database, no_having_t>().dynamic_having(std::forward<T>(t)))
   {
-    return statement_t<void, no_having_t>().dynamic_having(std::forward<T>(t));
+    return statement_t<Database, no_having_t>().dynamic_having(std::forward<T>(t));
   }
 }
 
diff --git a/include/sqlpp11/select_column_list.h b/include/sqlpp11/select_column_list.h
index ed99ff2e..3ab677fa 100644
--- a/include/sqlpp11/select_column_list.h
+++ b/include/sqlpp11/select_column_list.h
@@ -449,7 +449,7 @@ namespace sqlpp
 
   template <typename Database, typename... T>
   auto dynamic_select_columns(const Database&, T&&... t)
-      -> decltype(statement_t<void, no_select_column_list_t>().dynamic_columns(std::forward<T>(t)...))
+      -> decltype(statement_t<Database, no_select_column_list_t>().dynamic_columns(std::forward<T>(t)...))
   {
     return statement_t<Database, no_select_column_list_t>().dynamic_columns(std::forward<T>(t)...);
   }
diff --git a/test_serializer/CustomQuery.cpp b/test_serializer/CustomQuery.cpp
index 33f2f5db..8f84205d 100644
--- a/test_serializer/CustomQuery.cpp
+++ b/test_serializer/CustomQuery.cpp
@@ -33,6 +33,7 @@ int CustomQuery(int, char* [])
 {
   const auto foo = test::TabFoo{};
   const auto bar = test::TabBar{};
+  auto db = MockDb{};
 
   // Unconditionally
   compare(__LINE__, custom_query(sqlpp::select(), select_flags(sqlpp::distinct), select_columns(foo.omega), from(foo),
@@ -48,5 +49,15 @@ int CustomQuery(int, char* [])
           "(tab_bar.alpha>17)  GROUP BY tab_foo.omega  HAVING (AVG(tab_bar.alpha)>19)  ORDER BY tab_foo.omega ASC  "
           "LIMIT 10  OFFSET 100");
 
+  // A full select statement made individual clauses
+  compare(
+      __LINE__,
+      custom_query(sqlpp::select(), dynamic_select_flags(db, sqlpp::distinct), dynamic_select_columns(db, foo.omega),
+                   dynamic_from(db, foo.join(bar).on(foo.omega == bar.alpha)), dynamic_where(db, bar.alpha > 17),
+                   dynamic_group_by(db, foo.omega), dynamic_having(db, avg(bar.alpha) > 19),
+                   dynamic_order_by(db, foo.omega.asc()), sqlpp::dynamic_limit(db), sqlpp::dynamic_offset(db)),
+      "SELECT  DISTINCT  tab_foo.omega  FROM tab_foo INNER JOIN tab_bar ON (tab_foo.omega=tab_bar.alpha)  WHERE "
+      "(tab_bar.alpha>17)  GROUP BY tab_foo.omega  HAVING (AVG(tab_bar.alpha)>19)  ORDER BY tab_foo.omega ASC  ");
+
   return 0;
 }