diff --git a/runtime/Java/src/org/antlr/v4/runtime/misc/OrderedHashSet.java b/runtime/Java/src/org/antlr/v4/runtime/misc/OrderedHashSet.java
index 9eddf5f79..8b88529e2 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/misc/OrderedHashSet.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/misc/OrderedHashSet.java
@@ -114,8 +114,9 @@ public class OrderedHashSet<T> extends LinkedHashSet<T> {
 
     @Override
     public Object clone() {
+        @SuppressWarnings("unchecked")
         OrderedHashSet<T> dup = (OrderedHashSet<T>)super.clone();
-        dup.elements = (ArrayList<T>)this.elements.clone();
+        dup.elements = new ArrayList<T>(this.elements);
         return dup;
     }