diff --git a/include/sqlpp11/result_row.h b/include/sqlpp11/result_row.h
index 509a9acd..150e5101 100644
--- a/include/sqlpp11/result_row.h
+++ b/include/sqlpp11/result_row.h
@@ -28,7 +28,7 @@
 #define SQLPP_RESULT_ROW_H
 
 #include <sqlpp11/raw_result_row.h>
-#include <sqlpp11/multi_column.h>
+#include <sqlpp11/field.h>
 #include <iostream>
 namespace sqlpp
 {
@@ -59,7 +59,7 @@ namespace sqlpp
 			};
 
 		template<size_t level, size_t index, typename AliasProvider, typename... Col, typename... Rest>
-			struct result_row_impl<level, index, multi_column_t<AliasProvider, std::tuple<Col...>>, Rest...>: 
+			struct result_row_impl<level, index, multi_field_t<AliasProvider, std::tuple<Col...>>, Rest...>: 
 			public AliasProvider::template _member_t<result_row_impl<level + 1, index, Col...>>, // level prevents identical closures to be present twice in the inheritance tree
 			public result_row_impl<level, index + sizeof...(Col), Rest...>
 			{
diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h
index 7c31177f..62a67703 100644
--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -41,6 +41,7 @@
 #include <sqlpp11/order_by.h>
 #include <sqlpp11/limit.h>
 #include <sqlpp11/expression.h>
+#include <sqlpp11/field.h>
 
 #include <sqlpp11/detail/wrong.h>
 #include <sqlpp11/detail/make_flag_tuple.h>
@@ -102,7 +103,7 @@ namespace sqlpp
 			using add_limit_t = select_t<Flags, ExpressionList, From, Where, GroupBy, Having, OrderBy, limit_t, Offset>;
 			using add_offset_t = select_t<Flags, ExpressionList, From, Where, GroupBy, Having, OrderBy, Limit, offset_t>;
 
-			using _result_row_t = result_row_t<NamedExpr...>;
+			using _result_row_t = result_row_t<make_field_t<NamedExpr>...>;
 
 			// Indicators
 			using _value_type = typename std::conditional<
diff --git a/tests/SelectTest.cpp b/tests/SelectTest.cpp
index 027a9fc2..2aef3709 100644
--- a/tests/SelectTest.cpp
+++ b/tests/SelectTest.cpp
@@ -38,6 +38,7 @@ DbMock db;
 int main()
 {
 	TabSample t;
+	TabFoo f; 
 
 	// Test a table
 	{
@@ -249,6 +250,17 @@ int main()
 		static_assert(not sqlpp::is_value_t<decltype(a)>::value, "a multi_column is not a value");
 	}
 
+	// Test that result sets with identical name/value combinations have identical types
+	{
+		auto a = select(t.alpha);
+		auto b = select(f.omega.as(t.alpha));
+		using A = typename decltype(a)::_result_row_t;
+		using B = typename decltype(b)::_result_row_t;
+		static_assert(std::is_same<decltype(t.alpha)::_value_type::_base_value_type, decltype(f.omega)::_value_type::_base_value_type>::value, "Two bigint columns must have identical base_value_type");
+		//A x = std::declval<B>();
+		static_assert(std::is_same<A, B>::value, "select with identical columns(name/value_type) need to have identical result_types");
+	}
+
 
 	static_assert(sqlpp::is_select_flag_t<decltype(sqlpp::all)>::value, "sqlpp::all has to be a select_flag");
   using T = sqlpp::detail::wrap_operand<int>::type;