diff --git a/ebean-api/src/main/java/io/ebean/bean/CallStack.java b/ebean-api/src/main/java/io/ebean/bean/CallStack.java
index 934f53321..9bf5a618f 100644
--- a/ebean-api/src/main/java/io/ebean/bean/CallStack.java
+++ b/ebean-api/src/main/java/io/ebean/bean/CallStack.java
@@ -41,14 +41,14 @@ public final class CallStack implements Serializable, CallOrigin {
   public CallStack(List<StackWalker.StackFrame> frames) {
     this.callStack = frames.toArray(new Object[0]);
     this.hc = computeHashCode();
-    this.zeroHash = enc(callStack[0].hashCode());
+    this.zeroHash = enc(callStack[0].toString().hashCode());
     this.pathHash = enc(hc);
   }
 
   private int computeHashCode() {
     int hc = 0;
     for (Object element : callStack) {
-      hc = 92821 * hc + element.hashCode();
+      hc = 92821 * hc + element.toString().hashCode();
     }
     return hc;
   }
diff --git a/ebean-api/src/main/java/io/ebean/util/StackWalkFilter.java b/ebean-api/src/main/java/io/ebean/util/StackWalkFilter.java
index a68df25d4..c00ea42eb 100644
--- a/ebean-api/src/main/java/io/ebean/util/StackWalkFilter.java
+++ b/ebean-api/src/main/java/io/ebean/util/StackWalkFilter.java
@@ -22,6 +22,7 @@ public final class StackWalkFilter {
     public boolean test(StackWalker.StackFrame stackFrame) {
       return !stackFrame.getClassName().startsWith("io.ebean")
         && !stackFrame.getClassName().startsWith("jdk.")
+        && !stackFrame.getClassName().startsWith("java.")
         && !stackFrame.getMethodName().startsWith("_ebean_");
     }
   }