diff --git a/gremlin/pom.xml b/gremlin/pom.xml
index ff6d28fdff..d0912e5ceb 100644
--- a/gremlin/pom.xml
+++ b/gremlin/pom.xml
@@ -34,7 +34,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <gremlin.version>3.5.2</gremlin.version>
+        <gremlin.version>3.6.0</gremlin.version>
         <translation.version>1.0.4</translation.version>
     </properties>
 
diff --git a/gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java b/gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java
index 66592ee7b5..474ddb061a 100644
--- a/gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java
+++ b/gremlin/src/main/java/org/apache/tinkerpop/gremlin/arcadedb/structure/ArcadeGraph.java
@@ -211,7 +211,14 @@ public Iterator<Vertex> vertices(final Object... vertexIds) {
       return resultset.stream().map(result -> (Vertex) new ArcadeVertex(this, (com.arcadedb.graph.Vertex) (result.toElement()))).iterator();
     }
 
-    ElementHelper.validateMixedElementIds(Vertex.class, vertexIds);
+//    ElementHelper.validateMixedElementIds(Vertex.class, vertexIds);
+    if (vertexIds.length > 1) {
+      final boolean element = Vertex.class.isAssignableFrom(vertexIds[0].getClass());
+      for (int i = 1; i < vertexIds.length; i++) {
+        if (Vertex.class.isAssignableFrom(vertexIds[i].getClass()) != element)
+          throw new IllegalArgumentException("id arguments must be either ids or Elements");
+      }
+    }
 
     final List<Vertex> resultSet = new ArrayList<>(vertexIds.length);
 
@@ -275,7 +282,15 @@ public Iterator<Edge> edges(final Object... edgeIds) {
 
     }
 
-    ElementHelper.validateMixedElementIds(Vertex.class, edgeIds);
+//    ElementHelper.validateMixedElementIds(Vertex.class, edgeIds);
+    if (edgeIds.length > 1) {
+      final boolean element = Vertex.class.isAssignableFrom(edgeIds[0].getClass());
+      for (int i = 1; i < edgeIds.length; i++) {
+        if (Vertex.class.isAssignableFrom(edgeIds[i].getClass()) != element)
+          throw new IllegalArgumentException("id arguments must be either ids or Elements");
+      }
+    }
+
 
     final List<Edge> resultSet = new ArrayList<>(edgeIds.length);
 
diff --git a/gremlin/src/test/java/org/apache/tinkerpop/gremlin/arcadedb/GremlinTest.java b/gremlin/src/test/java/org/apache/tinkerpop/gremlin/arcadedb/GremlinTest.java
index 10c476b82e..219a4d1d1a 100644
--- a/gremlin/src/test/java/org/apache/tinkerpop/gremlin/arcadedb/GremlinTest.java
+++ b/gremlin/src/test/java/org/apache/tinkerpop/gremlin/arcadedb/GremlinTest.java
@@ -252,7 +252,7 @@ public void sort() throws ExecutionException, InterruptedException {
       alice.addEdge("FriendOf", steve);
       steve.addEdge("FriendOf", bob);
 
-      final ArcadeGremlin gremlinReadOnly = graph.gremlin("g.E().order().by('name', asc)");
+      final ArcadeGremlin gremlinReadOnly = graph.gremlin("g.V().order().by('name', asc)");
       final ResultSet result = gremlinReadOnly.execute();
 
       Assertions.assertTrue(result.hasNext());