diff --git a/Source/Editor/Surface/SurfaceNode.cs b/Source/Editor/Surface/SurfaceNode.cs
index aa4fb4eb7..88d6647cd 100644
--- a/Source/Editor/Surface/SurfaceNode.cs
+++ b/Source/Editor/Surface/SurfaceNode.cs
@@ -893,7 +893,7 @@ namespace FlaxEditor.Surface
         {
             if (_isDuringValuesEditing || !Surface.CanEdit)
                 return;
-            if (Equals(value, Values[index]))
+            if (FlaxEngine.Json.JsonSerializer.ValueEquals(value, Values[index]))
                 return;
             if (value is byte[] && Values[index] is byte[] && Utils.ArraysEqual((byte[])value, (byte[])Values[index]))
                 return;
diff --git a/Source/Engine/Core/Math/Vector2.cs b/Source/Engine/Core/Math/Vector2.cs
index 530a36f80..43c698ce3 100644
--- a/Source/Engine/Core/Math/Vector2.cs
+++ b/Source/Engine/Core/Math/Vector2.cs
@@ -1796,7 +1796,7 @@ namespace FlaxEngine
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool Equals(Vector2 other)
         {
-            return Mathf.NearEqual(X, X) && Mathf.NearEqual(other.Y, other.Y);
+            return Mathf.NearEqual(other.X, X) && Mathf.NearEqual(other.Y, Y);
         }
 
         /// <summary>
@@ -1808,7 +1808,7 @@ namespace FlaxEngine
         {
             if (!(value is Vector2 other))
                 return false;
-            return Mathf.NearEqual(X, X) && Mathf.NearEqual(other.Y, other.Y);
+            return Mathf.NearEqual(other.X, X) && Mathf.NearEqual(other.Y, Y);
         }
     }
 }