--- a/src/jdk.incubator.adba/share/classes/jdk/incubator/sql2/Result.java	Fri Jul 06 20:37:32 2018 -0400
+++ b/src/jdk.incubator.adba/share/classes/jdk/incubator/sql2/Result.java	Mon Jul 09 15:09:06 2018 -0400
@@ -241,12 +241,14 @@
     public default void forEach(Consumer<? super Column> action) {
       do {
         action.accept(this);
-      } while (hasNext());
+        if (!hasNext()) break;
+        next();
+      } while (true);
     }
 
     @Override
     public default Column iterator() {
-      return this;
+      return this.clone();
     }
 
     /**