diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
index 6a1a8afd2..7b3e74085 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
@@ -171,8 +171,7 @@ public final class BatchedPstmt implements SpiProfileTransactionEvent {
     try (ResultSet rset = pstmt.getGeneratedKeys()) {
       while (rset.next()) {
         Object idValue = rset.getObject(1);
-        list.get(index).setGeneratedKey(idValue);
-        index++;
+        list.get(index++).setGeneratedKey(idValue);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DB2GetKeys.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DB2GetKeys.java
index 38d0fe7b4..a077be908 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DB2GetKeys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DB2GetKeys.java
@@ -44,8 +44,7 @@ final class DB2GetKeys {
         for (ResultSet resultSet : result) {
           while (resultSet.next()) {
             Object idValue = resultSet.getObject(1);
-            list.get(index).setGeneratedKey(idValue);
-            index++;
+            list.get(index++).setGeneratedKey(idValue);
           }
         }
         return true;