Index: src/net/lemnik/eodsql/spi/util/ConnectedDataSet.java
===================================================================
--- src/net/lemnik/eodsql/spi/util/ConnectedDataSet.java	(revision 217)
+++ src/net/lemnik/eodsql/spi/util/ConnectedDataSet.java	(working copy)
@@ -295,11 +295,7 @@
         }
         
         public int nextIndex() {
-            if(hasNext()) {
-                return cursor + 1;
-            } else {
-                return cursor;
-            }
+            return cursor;
         }
         
         public int previousIndex() {
@@ -307,15 +303,15 @@
         }
         
         public void remove() {
-            ConnectedDataSet.this.remove(cursor);
+            ConnectedDataSet.this.remove(previousIndex());
         }
         
         public void set(final T e) {
-            ConnectedDataSet.this.set(cursor, e);
+            ConnectedDataSet.this.set(previousIndex(), e);
         }
         
         public void add(final T e) {
-            ConnectedDataSet.this.add(cursor, e);
+            ConnectedDataSet.this.add(previousIndex(), e);
         }
         
     }