diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl
index e8408997..6444f0df 100644
--- a/glm/detail/type_vec2.inl
+++ b/glm/detail/type_vec2.inl
@@ -106,28 +106,60 @@ namespace glm
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR T & vec<2, T, Q>::operator[](typename vec<2, T, Q>::length_type i)
 	{
 		GLM_ASSERT_LENGTH(i, this->length());
-		switch(i)
+
+#if GLM_LANG & GLM_LANG_CXX14_FLAG || GLM_LANG & GLM_LANG_CXX17_FLAG
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
+		if (std::is_constant_evaluated())
 		{
-		default:
-		case 0:
-			return x;
-		case 1:
-			return y;
+	#endif
+			switch (i)
+			{
+			default:
+			case 0:
+				return x;
+			case 1:
+				return y;
+			}
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
 		}
+		else
+		{
+			return (&x)[i];
+		}
+	#endif
+#else
+		return (&x)[i];
+#endif
 	}
 
 	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& vec<2, T, Q>::operator[](typename vec<2, T, Q>::length_type i) const
 	{
 		GLM_ASSERT_LENGTH(i, this->length());
-		switch(i)
+
+#if GLM_LANG & GLM_LANG_CXX14_FLAG || GLM_LANG & GLM_LANG_CXX17_FLAG
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
+		if (std::is_constant_evaluated())
 		{
-		default:
-		case 0:
-			return x;
-		case 1:
-			return y;
+	#endif
+			switch (i)
+			{
+			default:
+			case 0:
+				return x;
+			case 1:
+				return y;
+			}
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
 		}
+		else
+		{
+			return (&x)[i];
+		}
+	#endif
+#else
+		return (&x)[i];
+#endif
 	}
 
 	// -- Unary arithmetic operators --
diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl
index fed82bf6..d5b3cf28 100644
--- a/glm/detail/type_vec3.inl
+++ b/glm/detail/type_vec3.inl
@@ -171,32 +171,64 @@ namespace glm
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR T & vec<3, T, Q>::operator[](typename vec<3, T, Q>::length_type i)
 	{
 		GLM_ASSERT_LENGTH(i, this->length());
-		switch(i)
+
+#if GLM_LANG & GLM_LANG_CXX14_FLAG || GLM_LANG & GLM_LANG_CXX17_FLAG
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
+		if (std::is_constant_evaluated())
 		{
-		default:
+	#endif
+			switch (i)
+			{
+			default:
 			case 0:
-		return x;
+				return x;
 			case 1:
-		return y;
+				return y;
 			case 2:
-		return z;
+				return z;
+			}
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
 		}
+		else
+		{
+			return (&x)[i];
+		}
+	#endif
+#else
+		return (&x)[i];
+#endif
 	}
 
 	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& vec<3, T, Q>::operator[](typename vec<3, T, Q>::length_type i) const
 	{
 		GLM_ASSERT_LENGTH(i, this->length());
-		switch(i)
+
+#if GLM_LANG & GLM_LANG_CXX14_FLAG || GLM_LANG & GLM_LANG_CXX17_FLAG
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
+		if (std::is_constant_evaluated())
 		{
-		default:
-		case 0:
-			return x;
-		case 1:
-			return y;
-		case 2:
-			return z;
+	#endif
+			switch (i)
+			{
+			default:
+			case 0:
+				return x;
+			case 1:
+				return y;
+			case 2:
+				return z;
+			}
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
 		}
+		else
+		{
+			return (&x)[i];
+		}
+	#endif
+#else
+		return (&x)[i];
+#endif
 	}
 
 	// -- Unary arithmetic operators --
diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl
index 66539e30..f83cfca2 100644
--- a/glm/detail/type_vec4.inl
+++ b/glm/detail/type_vec4.inl
@@ -362,36 +362,68 @@ namespace detail
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR T& vec<4, T, Q>::operator[](typename vec<4, T, Q>::length_type i)
 	{
 		GLM_ASSERT_LENGTH(i, this->length());
-		switch (i)
+
+#if GLM_LANG & GLM_LANG_CXX14_FLAG || GLM_LANG & GLM_LANG_CXX17_FLAG
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
+		if (std::is_constant_evaluated())
 		{
-		default:
-		case 0:
-			return x;
-		case 1:
-			return y;
-		case 2:
-			return z;
-		case 3:
-			return w;
+	#endif
+			switch (i)
+			{
+			default:
+			case 0:
+				return x;
+			case 1:
+				return y;
+			case 2:
+				return z;
+			case 3:
+				return w;
+			}
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
 		}
+		else
+		{
+			return (&x)[i];
+		}
+	#endif
+#else
+		return (&x)[i];
+#endif
 	}
 
 	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& vec<4, T, Q>::operator[](typename vec<4, T, Q>::length_type i) const
 	{
 		GLM_ASSERT_LENGTH(i, this->length());
-		switch (i)
+
+#if GLM_LANG & GLM_LANG_CXX14_FLAG || GLM_LANG & GLM_LANG_CXX17_FLAG
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
+		if (std::is_constant_evaluated())
 		{
-		default:
-		case 0:
-			return x;
-		case 1:
-			return y;
-		case 2:
-			return z;
-		case 3:
-			return w;
+	#endif
+			switch (i)
+			{
+			default:
+			case 0:
+				return x;
+			case 1:
+				return y;
+			case 2:
+				return z;
+			case 3:
+				return w;
+			}
+	#if GLM_LANG & GLM_LANG_CXX20_FLAG
 		}
+		else
+		{
+			return (&x)[i];
+		}
+	#endif
+#else
+		return (&x)[i];
+#endif
 	}
 
 	// -- Unary arithmetic operators --
diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl
index 3a04160e..a5017fb0 100644
--- a/glm/gtx/dual_quaternion.inl
+++ b/glm/gtx/dual_quaternion.inl
@@ -10,14 +10,14 @@ namespace glm
 	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER typename tdualquat<T, Q>::part_type & tdualquat<T, Q>::operator[](typename tdualquat<T, Q>::length_type i)
 	{
-		assert(i >= 0 && i < this->length());
+		GLM_ASSERT_LENGTH(i, this->length());
 		return (&real)[i];
 	}
 
 	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER typename tdualquat<T, Q>::part_type const& tdualquat<T, Q>::operator[](typename tdualquat<T, Q>::length_type i) const
 	{
-		assert(i >= 0 && i < this->length());
+		GLM_ASSERT_LENGTH(i, this->length());
 		return (&real)[i];
 	}