diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7b29f8..03bc8ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,6 @@
 -   Added `soagen::for_each_column()`
 -   Added `row::for_each_column()`
 -   Added generic names `first`, `second`, ..., `sixteenth` for unnamed columns 0-15
--   Added const propagation to `soagen::row` member functions
 -   Binary size improvements
 -   Documentation improvements
 
diff --git a/src/soagen/hpp/iterator.hpp b/src/soagen/hpp/iterator.hpp
index afad467..e4e3d85 100644
--- a/src/soagen/hpp/iterator.hpp
+++ b/src/soagen/hpp/iterator.hpp
@@ -222,8 +222,8 @@ namespace soagen
 			SOAGEN_ASSUME(!!base::table);
 			SOAGEN_ASSUME(base::offset >= 0);
 
-			return row_type{ { static_cast<value_ref<Soa, Columns>>(
-				base::table->template column<Columns>()[base::offset]) }... };
+			return row_type{ static_cast<value_ref<Soa, Columns>>(
+				base::table->template column<Columns>()[base::offset])... };
 		}
 
 		/// @brief Returns the row the iterator refers to.
@@ -240,8 +240,8 @@ namespace soagen
 			SOAGEN_ASSUME(!!base::table);
 			SOAGEN_ASSUME(base::offset + offset >= 0);
 
-			return row_type{ { static_cast<value_ref<Soa, Columns>>(
-				base::table->template column<Columns>()[base::offset + offset]) }... };
+			return row_type{ static_cast<value_ref<Soa, Columns>>(
+				base::table->template column<Columns>()[base::offset + offset])... };
 		}
 
 		/// @}
diff --git a/src/soagen/hpp/mixins/rows.hpp b/src/soagen/hpp/mixins/rows.hpp
index 7248bea..9342baf 100644
--- a/src/soagen/hpp/mixins/rows.hpp
+++ b/src/soagen/hpp/mixins/rows.hpp
@@ -30,13 +30,13 @@ namespace soagen::mixins
 		{
 			if constexpr (sizeof...(Cols))
 			{
-				return { { static_cast<value_ref<Derived&, Cols>>(
-					static_cast<Derived&>(*this).template column<static_cast<size_type>(Cols)>()[index]) }... };
+				return { static_cast<value_ref<Derived, Cols>>(
+					static_cast<Derived&>(*this).template column<static_cast<size_type>(Cols)>()[index])... };
 			}
 			else
 			{
-				return { { static_cast<value_ref<Derived&, Columns>>(
-					static_cast<Derived&>(*this).template column<static_cast<size_type>(Columns)>()[index]) }... };
+				return { static_cast<value_ref<Derived, Columns>>(
+					static_cast<Derived&>(*this).template column<static_cast<size_type>(Columns)>()[index])... };
 			}
 		}
 
@@ -47,31 +47,31 @@ namespace soagen::mixins
 		{
 			if constexpr (sizeof...(Cols))
 			{
-				return { { static_cast<value_ref<Derived&&, Cols>>(
-					static_cast<Derived&&>(*this).template column<static_cast<size_type>(Cols)>()[index]) }... };
+				return { static_cast<value_ref<Derived&&, Cols>>(
+					static_cast<Derived&&>(*this).template column<static_cast<size_type>(Cols)>()[index])... };
 			}
 			else
 			{
-				return { { static_cast<value_ref<Derived&&, Columns>>(
-					static_cast<Derived&&>(*this).template column<static_cast<size_type>(Columns)>()[index]) }... };
+				return { static_cast<value_ref<Derived&&, Columns>>(
+					static_cast<Derived&&>(*this).template column<static_cast<size_type>(Columns)>()[index])... };
 			}
 		}
 
 		template <auto... Cols>
 		SOAGEN_PURE_GETTER
 		SOAGEN_CPP20_CONSTEXPR
-		soagen::row_type<const Derived, Cols...> row(size_type index) const& noexcept
+		soagen::const_row_type<Derived, Cols...> row(size_type index) const& noexcept
 		{
 			if constexpr (sizeof...(Cols))
 			{
-				return { { static_cast<value_ref<const Derived&, Cols>>(
-					static_cast<const Derived&>(*this).template column<static_cast<size_type>(Cols)>()[index]) }... };
+				return { static_cast<value_ref<const Derived, Cols>>(
+					static_cast<const Derived&>(*this).template column<static_cast<size_type>(Cols)>()[index])... };
 			}
 			else
 			{
-				return { { static_cast<value_ref<const Derived&, Columns>>(
+				return { static_cast<value_ref<const Derived, Columns>>(
 					static_cast<const Derived&>(*this)
-						.template column<static_cast<size_type>(Columns)>()[index]) }... };
+						.template column<static_cast<size_type>(Columns)>()[index])... };
 			}
 		}
 
diff --git a/src/soagen/hpp/names.hpp b/src/soagen/hpp/names.hpp
index 1f735a3..ef54cd8 100644
--- a/src/soagen/hpp/names.hpp
+++ b/src/soagen/hpp/names.hpp
@@ -27,15 +27,10 @@
                                                                                                                        \
 		  protected:                                                                                                   \
 			SOAGEN_PURE_INLINE_GETTER                                                                                  \
-			constexpr T get_ref() noexcept                                                                             \
+			constexpr T get_ref() const noexcept                                                                       \
 			{                                                                                                          \
 				return static_cast<T>(Name);                                                                           \
 			}                                                                                                          \
-			SOAGEN_PURE_INLINE_GETTER                                                                                  \
-			constexpr decltype(auto) get_ref() const noexcept                                                          \
-			{                                                                                                          \
-				return static_cast<copy_ref<std::add_const_t<std::remove_reference_t<T>>, T>>(Name);                   \
-			}                                                                                                          \
 		};                                                                                                             \
                                                                                                                        \
 		template <typename Derived, size_t Column>                                                                     \
@@ -113,17 +108,11 @@ namespace soagen::detail
 		T val_;
 
 		SOAGEN_PURE_INLINE_GETTER
-		constexpr T get_ref() noexcept
+		constexpr T get_ref() const noexcept
 		{
 			return static_cast<T>(val_);
 		}
 
-		SOAGEN_PURE_INLINE_GETTER
-		constexpr decltype(auto) get_ref() const noexcept
-		{
-			return static_cast<copy_ref<std::add_const_t<std::remove_reference_t<T>>, T>>(val_);
-		}
-
 	  public:
 		template <typename Val>
 		SOAGEN_NODISCARD_CTOR
@@ -179,19 +168,20 @@ namespace soagen::detail
 
 	//--- column references ---------
 
-	template <typename Derived, size_t Column>
-	struct SOAGEN_EMPTY_BASES column_ref : named_ref<column_name_tag<Derived, Column>, value_ref<Derived, Column>>
+	template <typename Soa, size_t Column>
+	struct SOAGEN_EMPTY_BASES column_ref //
+		: named_ref<column_name_tag<Soa, Column>, value_ref<Soa, Column>>
 	{
-		static_assert(!std::is_lvalue_reference_v<Derived>);
+		static_assert(!std::is_lvalue_reference_v<Soa>);
 	};
 
 	//--- column functions ---------
 
-	template <typename Derived, size_t Column>
+	template <typename Soa, size_t Column>
 	struct SOAGEN_EMPTY_BASES column_func //
-		: named_func<column_name_tag<Derived, Column>, Derived, Column>
+		: named_func<column_name_tag<Soa, Column>, Soa, Column>
 	{
-		static_assert(!is_cvref<Derived>);
+		static_assert(!is_cvref<Soa>);
 	};
 }
 /// @endcond
diff --git a/src/soagen/hpp/row.hpp b/src/soagen/hpp/row.hpp
index a0b7449..35880cf 100644
--- a/src/soagen/hpp/row.hpp
+++ b/src/soagen/hpp/row.hpp
@@ -145,23 +145,23 @@ namespace soagen
 					  "row_base specializations may not have data members");
 		static_assert(std::is_trivial_v<row_base<row<Soa, Columns...>>>, "row_base specializations must be trivial");
 
+		/// @cond
+
+		SOAGEN_NODISCARD_CTOR
+		constexpr row(value_ref<Soa, Columns>... args) noexcept //
+			: detail::column_ref<Soa, Columns>{ static_cast<value_ref<Soa, Columns>>(args) }...
+		{}
+
+		SOAGEN_DEFAULT_RULE_OF_FIVE(row);
+
+		/// @endcond
+
 		/// @name Columns
 		/// @{
 
 		/// @brief Returns a reference to the specified column's value.
 		template <auto Column>
 		SOAGEN_PURE_INLINE_GETTER
-		constexpr decltype(auto) column() noexcept
-		{
-			static_assert(static_cast<size_t>(Column) < table_traits_type<Soa>::column_count,
-						  "column index out of range");
-
-			return detail::column_ref<Soa, static_cast<size_t>(Column)>::get_ref();
-		}
-
-		/// @brief Returns a reference to the specified column's value (const overload).
-		template <auto Column>
-		SOAGEN_PURE_INLINE_GETTER
 		constexpr decltype(auto) column() const noexcept
 		{
 			static_assert(static_cast<size_t>(Column) < table_traits_type<Soa>::column_count,
@@ -174,16 +174,6 @@ namespace soagen
 		/// @see soagen::for_each_column
 		template <typename Func>
 		SOAGEN_ALWAYS_INLINE
-		constexpr void for_each_column(Func&& func) //
-			noexcept(noexcept(soagen::for_each_column(std::declval<row&>(), std::declval<Func&&>())))
-		{
-			soagen::for_each_column(*this, static_cast<Func&&>(func));
-		}
-
-		/// @brief Invokes a callable once for each column in the row (const overload).
-		/// @see soagen::for_each_column
-		template <typename Func>
-		SOAGEN_ALWAYS_INLINE
 		constexpr void for_each_column(Func&& func) const //
 			noexcept(noexcept(soagen::for_each_column(std::declval<const row&>(), std::declval<Func&&>())))
 		{
@@ -199,17 +189,6 @@ namespace soagen
 		/// @note `Member` corresponds to the column at the specified position of the `Columns` template argument.
 		template <auto Member>
 		SOAGEN_PURE_INLINE_GETTER
-		constexpr decltype(auto) get() noexcept
-		{
-			static_assert(Member < sizeof...(Columns), "member index out of range");
-
-			return type_at_index<static_cast<size_t>(Member), detail::column_ref<Soa, Columns>...>::get_ref();
-		}
-
-		/// @brief Returns a reference to the specified member's value (const overload).
-		/// @note `Member` corresponds to the column at the specified position of the `Columns` template argument.
-		template <auto Member>
-		SOAGEN_PURE_INLINE_GETTER
 		constexpr decltype(auto) get() const noexcept
 		{
 			static_assert(Member < sizeof...(Columns), "member index out of range");
@@ -230,6 +209,11 @@ namespace soagen
 		friend constexpr bool operator==(const row& lhs, const row<T, Columns...>& rhs) //
 			noexcept(table_traits_type<Soa>::all_nothrow_equality_comparable)
 		{
+			if constexpr (std::is_same_v<Soa, T>)
+			{
+				if (&lhs == &rhs)
+					return true;
+			}
 			return ((lhs.template column<Columns>() == rhs.template column<Columns>()) && ...);
 		}
 
@@ -257,6 +241,12 @@ namespace soagen
 		static constexpr int row_compare_impl(const row& lhs, const row<T, Columns...>& rhs) //
 			noexcept(table_traits_type<Soa>::all_nothrow_less_than_comparable)
 		{
+			if constexpr (std::is_same_v<Soa, T>)
+			{
+				if (&lhs == &rhs)
+					return 0;
+			}
+
 			if (lhs.template get<Member>() < rhs.template get<Member>())
 				return -1;
 
@@ -341,8 +331,7 @@ namespace soagen
 		SOAGEN_PURE_INLINE_GETTER
 		constexpr operator row<T, Cols...>() const noexcept
 		{
-			return row<T, Cols...>{ { static_cast<decltype(std::declval<row<T, Cols...>>().template column<Cols>())>(
-				this->template column<Cols>()) }... };
+			return row<T, Cols...>{ static_cast<value_ref<T, Cols>>(this->template column<Cols>())... };
 		}
 
 		/// @cond
@@ -354,8 +343,7 @@ namespace soagen
 		SOAGEN_PURE_INLINE_GETTER
 		explicit constexpr operator row<T, Cols...>() const noexcept
 		{
-			return row<T, Cols...>{ { static_cast<decltype(std::declval<row<T, Cols...>>().template column<Cols>())>(
-				this->template column<Cols>()) }... };
+			return row<T, Cols...>{ static_cast<value_ref<T, Cols>>(this->template column<Cols>())... };
 		}
 
 		/// @endcond
diff --git a/src/soagen/hpp/single/soagen.hpp b/src/soagen/hpp/single/soagen.hpp
index a4b6a64..e0b9bd9 100644
--- a/src/soagen/hpp/single/soagen.hpp
+++ b/src/soagen/hpp/single/soagen.hpp
@@ -3675,15 +3675,10 @@ namespace soagen::detail
                                                                                                                        \
 		  protected:                                                                                                   \
 			SOAGEN_PURE_INLINE_GETTER                                                                                  \
-			constexpr T get_ref() noexcept                                                                             \
+			constexpr T get_ref() const noexcept                                                                       \
 			{                                                                                                          \
 				return static_cast<T>(Name);                                                                           \
 			}                                                                                                          \
-			SOAGEN_PURE_INLINE_GETTER                                                                                  \
-			constexpr decltype(auto) get_ref() const noexcept                                                          \
-			{                                                                                                          \
-				return static_cast<copy_ref<std::add_const_t<std::remove_reference_t<T>>, T>>(Name);                   \
-			}                                                                                                          \
 		};                                                                                                             \
                                                                                                                        \
 		template <typename Derived, size_t Column>                                                                     \
@@ -3760,17 +3755,11 @@ namespace soagen::detail
 		T val_;
 
 		SOAGEN_PURE_INLINE_GETTER
-		constexpr T get_ref() noexcept
+		constexpr T get_ref() const noexcept
 		{
 			return static_cast<T>(val_);
 		}
 
-		SOAGEN_PURE_INLINE_GETTER
-		constexpr decltype(auto) get_ref() const noexcept
-		{
-			return static_cast<copy_ref<std::add_const_t<std::remove_reference_t<T>>, T>>(val_);
-		}
-
 	  public:
 		template <typename Val>
 		SOAGEN_NODISCARD_CTOR
@@ -3826,19 +3815,20 @@ namespace soagen::detail
 
 	//--- column references ---------
 
-	template <typename Derived, size_t Column>
-	struct SOAGEN_EMPTY_BASES column_ref : named_ref<column_name_tag<Derived, Column>, value_ref<Derived, Column>>
+	template <typename Soa, size_t Column>
+	struct SOAGEN_EMPTY_BASES column_ref //
+		: named_ref<column_name_tag<Soa, Column>, value_ref<Soa, Column>>
 	{
-		static_assert(!std::is_lvalue_reference_v<Derived>);
+		static_assert(!std::is_lvalue_reference_v<Soa>);
 	};
 
 	//--- column functions ---------
 
-	template <typename Derived, size_t Column>
+	template <typename Soa, size_t Column>
 	struct SOAGEN_EMPTY_BASES column_func //
-		: named_func<column_name_tag<Derived, Column>, Derived, Column>
+		: named_func<column_name_tag<Soa, Column>, Soa, Column>
 	{
-		static_assert(!is_cvref<Derived>);
+		static_assert(!is_cvref<Soa>);
 	};
 }
 
@@ -4033,15 +4023,12 @@ namespace soagen
 					  "row_base specializations may not have data members");
 		static_assert(std::is_trivial_v<row_base<row<Soa, Columns...>>>, "row_base specializations must be trivial");
 
-		template <auto Column>
-		SOAGEN_PURE_INLINE_GETTER
-		constexpr decltype(auto) column() noexcept
-		{
-			static_assert(static_cast<size_t>(Column) < table_traits_type<Soa>::column_count,
-						  "column index out of range");
+		SOAGEN_NODISCARD_CTOR
+		constexpr row(value_ref<Soa, Columns>... args) noexcept //
+			: detail::column_ref<Soa, Columns>{ static_cast<value_ref<Soa, Columns>>(args) }...
+		{}
 
-			return detail::column_ref<Soa, static_cast<size_t>(Column)>::get_ref();
-		}
+		SOAGEN_DEFAULT_RULE_OF_FIVE(row);
 
 		template <auto Column>
 		SOAGEN_PURE_INLINE_GETTER
@@ -4053,14 +4040,6 @@ namespace soagen
 			return detail::column_ref<Soa, static_cast<size_t>(Column)>::get_ref();
 		}
 
-		template <typename Func>
-		SOAGEN_ALWAYS_INLINE
-		constexpr void for_each_column(Func&& func) //
-			noexcept(noexcept(soagen::for_each_column(std::declval<row&>(), std::declval<Func&&>())))
-		{
-			soagen::for_each_column(*this, static_cast<Func&&>(func));
-		}
-
 		template <typename Func>
 		SOAGEN_ALWAYS_INLINE
 		constexpr void for_each_column(Func&& func) const //
@@ -4069,15 +4048,6 @@ namespace soagen
 			soagen::for_each_column(*this, static_cast<Func&&>(func));
 		}
 
-		template <auto Member>
-		SOAGEN_PURE_INLINE_GETTER
-		constexpr decltype(auto) get() noexcept
-		{
-			static_assert(Member < sizeof...(Columns), "member index out of range");
-
-			return type_at_index<static_cast<size_t>(Member), detail::column_ref<Soa, Columns>...>::get_ref();
-		}
-
 		template <auto Member>
 		SOAGEN_PURE_INLINE_GETTER
 		constexpr decltype(auto) get() const noexcept
@@ -4093,6 +4063,11 @@ namespace soagen
 		friend constexpr bool operator==(const row& lhs, const row<T, Columns...>& rhs) //
 			noexcept(table_traits_type<Soa>::all_nothrow_equality_comparable)
 		{
+			if constexpr (std::is_same_v<Soa, T>)
+			{
+				if (&lhs == &rhs)
+					return true;
+			}
 			return ((lhs.template column<Columns>() == rhs.template column<Columns>()) && ...);
 		}
 
@@ -4112,6 +4087,12 @@ namespace soagen
 		static constexpr int row_compare_impl(const row& lhs, const row<T, Columns...>& rhs) //
 			noexcept(table_traits_type<Soa>::all_nothrow_less_than_comparable)
 		{
+			if constexpr (std::is_same_v<Soa, T>)
+			{
+				if (&lhs == &rhs)
+					return 0;
+			}
+
 			if (lhs.template get<Member>() < rhs.template get<Member>())
 				return -1;
 
@@ -4168,8 +4149,7 @@ namespace soagen
 		SOAGEN_PURE_INLINE_GETTER
 		constexpr operator row<T, Cols...>() const noexcept
 		{
-			return row<T, Cols...>{ { static_cast<decltype(std::declval<row<T, Cols...>>().template column<Cols>())>(
-				this->template column<Cols>()) }... };
+			return row<T, Cols...>{ static_cast<value_ref<T, Cols>>(this->template column<Cols>())... };
 		}
 
 		SOAGEN_CONSTRAINED_TEMPLATE((!detail::row_implicit_conversion_ok<row, row<T, Cols...>>
@@ -4179,8 +4159,7 @@ namespace soagen
 		SOAGEN_PURE_INLINE_GETTER
 		explicit constexpr operator row<T, Cols...>() const noexcept
 		{
-			return row<T, Cols...>{ { static_cast<decltype(std::declval<row<T, Cols...>>().template column<Cols>())>(
-				this->template column<Cols>()) }... };
+			return row<T, Cols...>{ static_cast<value_ref<T, Cols>>(this->template column<Cols>())... };
 		}
 	};
 }
@@ -5301,8 +5280,8 @@ namespace soagen
 			SOAGEN_ASSUME(!!base::table);
 			SOAGEN_ASSUME(base::offset >= 0);
 
-			return row_type{ { static_cast<value_ref<Soa, Columns>>(
-				base::table->template column<Columns>()[base::offset]) }... };
+			return row_type{ static_cast<value_ref<Soa, Columns>>(
+				base::table->template column<Columns>()[base::offset])... };
 		}
 
 		SOAGEN_PURE_INLINE_GETTER
@@ -5317,8 +5296,8 @@ namespace soagen
 			SOAGEN_ASSUME(!!base::table);
 			SOAGEN_ASSUME(base::offset + offset >= 0);
 
-			return row_type{ { static_cast<value_ref<Soa, Columns>>(
-				base::table->template column<Columns>()[base::offset + offset]) }... };
+			return row_type{ static_cast<value_ref<Soa, Columns>>(
+				base::table->template column<Columns>()[base::offset + offset])... };
 		}
 
 		SOAGEN_CONSTRAINED_TEMPLATE((same_table_type<Soa, T>), typename T, size_t... Cols)
@@ -5732,13 +5711,13 @@ namespace soagen::mixins
 		{
 			if constexpr (sizeof...(Cols))
 			{
-				return { { static_cast<value_ref<Derived&, Cols>>(
-					static_cast<Derived&>(*this).template column<static_cast<size_type>(Cols)>()[index]) }... };
+				return { static_cast<value_ref<Derived, Cols>>(
+					static_cast<Derived&>(*this).template column<static_cast<size_type>(Cols)>()[index])... };
 			}
 			else
 			{
-				return { { static_cast<value_ref<Derived&, Columns>>(
-					static_cast<Derived&>(*this).template column<static_cast<size_type>(Columns)>()[index]) }... };
+				return { static_cast<value_ref<Derived, Columns>>(
+					static_cast<Derived&>(*this).template column<static_cast<size_type>(Columns)>()[index])... };
 			}
 		}
 
@@ -5749,31 +5728,31 @@ namespace soagen::mixins
 		{
 			if constexpr (sizeof...(Cols))
 			{
-				return { { static_cast<value_ref<Derived&&, Cols>>(
-					static_cast<Derived&&>(*this).template column<static_cast<size_type>(Cols)>()[index]) }... };
+				return { static_cast<value_ref<Derived&&, Cols>>(
+					static_cast<Derived&&>(*this).template column<static_cast<size_type>(Cols)>()[index])... };
 			}
 			else
 			{
-				return { { static_cast<value_ref<Derived&&, Columns>>(
-					static_cast<Derived&&>(*this).template column<static_cast<size_type>(Columns)>()[index]) }... };
+				return { static_cast<value_ref<Derived&&, Columns>>(
+					static_cast<Derived&&>(*this).template column<static_cast<size_type>(Columns)>()[index])... };
 			}
 		}
 
 		template <auto... Cols>
 		SOAGEN_PURE_GETTER
 		SOAGEN_CPP20_CONSTEXPR
-		soagen::row_type<const Derived, Cols...> row(size_type index) const& noexcept
+		soagen::const_row_type<Derived, Cols...> row(size_type index) const& noexcept
 		{
 			if constexpr (sizeof...(Cols))
 			{
-				return { { static_cast<value_ref<const Derived&, Cols>>(
-					static_cast<const Derived&>(*this).template column<static_cast<size_type>(Cols)>()[index]) }... };
+				return { static_cast<value_ref<const Derived, Cols>>(
+					static_cast<const Derived&>(*this).template column<static_cast<size_type>(Cols)>()[index])... };
 			}
 			else
 			{
-				return { { static_cast<value_ref<const Derived&, Columns>>(
+				return { static_cast<value_ref<const Derived, Columns>>(
 					static_cast<const Derived&>(*this)
-						.template column<static_cast<size_type>(Columns)>()[index]) }... };
+						.template column<static_cast<size_type>(Columns)>()[index])... };
 			}
 		}
 
diff --git a/tests/employees.cpp b/tests/employees.cpp
index f447177..b73d6d8 100644
--- a/tests/employees.cpp
+++ b/tests/employees.cpp
@@ -196,7 +196,7 @@ TEST_CASE("employees - general use")
 			CHECK(emp.tag()[0] == nullptr);
 			CHECK(emp[0] == emp[0]);
 			CHECK(emp[0] == std::as_const(emp)[0]);
-			CHECK(emp[0] == std::move(emp)[0]);
+			CHECK(emp[0] == static_cast<employees::rvalue_row_type>(emp[0]));
 			CHECK(emp[0] == std::move(std::as_const(emp))[0]);
 			CHECK(emp[0] <= emp[0]);
 			CHECK(emp[0] >= emp[0]);
@@ -269,7 +269,7 @@ TEST_CASE("employees - general use")
 			CHECK_ROW_EQ(emp.back(), "joe bloggs", 1, (1970, 1, 1), 50000, nullptr);
 			CHECK(emp[1] == emp[1]);
 			CHECK(emp[1] == std::as_const(emp)[1]);
-			CHECK(emp[1] == std::move(emp)[1]);
+			CHECK(emp[1] == static_cast<employees::rvalue_row_type>(emp[1]));
 			CHECK(emp[1] == std::move(std::as_const(emp))[1]);
 			CHECK(emp[1] != emp[0]);
 			CHECK(emp[1] != std::as_const(emp)[0]);
@@ -1075,8 +1075,8 @@ TEST_CASE("employees - general use")
 		static_assert(is_implicitly_convertible<row<const employees&&>, row<const employees>>);
 		static_assert(is_implicitly_convertible<row<employees&&>, row<const employees>>);
 		{
-			using to = row<const employees, 3, 1, 0>; // salary, id, name
-			to dest	 = std::move(emp[1]);			  // rvalue -> const lvalue
+			using to = row<const employees, 3, 1, 0>;					// salary, id, name
+			to dest	 = static_cast<employees::rvalue_row_type>(emp[1]); // rvalue -> const lvalue
 			CHECK(dest.column<3>() == 999999);
 			CHECK(dest.column<1>() == 0);
 			CHECK(dest.column<0>() == "mark gillard");