diff --git a/lib/src/main/java/io/cloudquery/scalar/Binary.java b/lib/src/main/java/io/cloudquery/scalar/Binary.java
index 2868b8e..acd3767 100644
--- a/lib/src/main/java/io/cloudquery/scalar/Binary.java
+++ b/lib/src/main/java/io/cloudquery/scalar/Binary.java
@@ -49,19 +49,13 @@ public void setValue(Object value) throws ValidationException {
 
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Binary o)) {
-            return false;
+        if (other instanceof Binary o) {
+            if (this.value == null) {
+                return o.value == null;
+            }
+            return Arrays.equals(this.value, o.value);
         }
-
-        if (!o.getClass().equals(this.getClass())) {
-            return false;
-        }
-
-        if (this.value == null) {
-            return o.value == null;
-        }
-
-        return Arrays.equals(this.value, o.value);
+        return false;
     }
 
     public static class LargeBinary extends Binary {
diff --git a/lib/src/main/java/io/cloudquery/scalar/UUID.java b/lib/src/main/java/io/cloudquery/scalar/UUID.java
index ced1ce5..16961e9 100644
--- a/lib/src/main/java/io/cloudquery/scalar/UUID.java
+++ b/lib/src/main/java/io/cloudquery/scalar/UUID.java
@@ -49,6 +49,17 @@ public void setValue(Object value) throws ValidationException {
         throw new ValidationException(ValidationException.NO_CONVERSION_AVAILABLE, this.dataType(), value);
     }
 
+    @Override
+    public final boolean equals(Object other) {
+        if (other instanceof UUID o) {
+            if (this.value == null) {
+                return o.value == null;
+            }
+            return this.value.equals(o.value);
+        }
+        return false;
+    }
+
     @Override
     public final int hashCode() {
         return Objects.hash(value);