diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientProperty.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientProperty.java
index 3e523bc..f279769 100644
--- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientProperty.java
+++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientProperty.java
@@ -95,7 +95,7 @@ public String toString() {
   }
 
   @Override
-  public final boolean equals(final Object object) {
+  public boolean equals(final Object object) {
     return ElementHelper.areEqual(this, object);
   }
 
diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertexProperty.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertexProperty.java
index 1d8b8ba..f2eb05a 100644
--- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertexProperty.java
+++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertexProperty.java
@@ -5,10 +5,12 @@
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import java.util.*;
 import java.util.stream.Stream;
+import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 
 public class OrientVertexProperty<V> extends OrientProperty<V> implements VertexProperty<V> {
 
@@ -89,6 +91,16 @@ private String metadataKey() {
     return "_meta_" + key;
   }
 
+  @Override
+  public boolean equals(final Object object) {
+    return ElementHelper.areEqual(this, object);
+  }
+
+  @Override
+  public int hashCode() {
+    return ElementHelper.hashCode((Element) this);
+  }
+
   @Override
   public Vertex element() {
     return (Vertex) element;