diff --git a/include/assimp/vector2.inl b/include/assimp/vector2.inl
index 5ce13eece..ee6c4d2d4 100644
--- a/include/assimp/vector2.inl
+++ b/include/assimp/vector2.inl
@@ -114,7 +114,15 @@ const aiVector2t<TReal>& aiVector2t<TReal>::operator /= (TReal f) {
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
 TReal aiVector2t<TReal>::operator[](unsigned int i) const {
-    return *(&x + i);
+	switch (i) {
+		case 0:
+			return x;
+		case 1:
+			return y;
+		default:
+			break;
+    }
+    return x;
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/include/assimp/vector3.inl b/include/assimp/vector3.inl
index a074bb23a..2b132c1a5 100644
--- a/include/assimp/vector3.inl
+++ b/include/assimp/vector3.inl
@@ -142,7 +142,6 @@ AI_FORCE_INLINE aiVector3t<TReal>& aiVector3t<TReal>::operator *= (const aiMatri
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
 AI_FORCE_INLINE TReal aiVector3t<TReal>::operator[](unsigned int i) const {
-//    return *(&x + i);
     switch (i) {
         case 0:
             return x;