diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java
index 8bbc44dd12..1d3ce3095e 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java
@@ -53,6 +53,7 @@
  * @author Mark Paluch
  * @author Jens Schauder
  * @author Yan Qiang
+ * @author Mikhail Fedorov
  * @since 3.0
  */
 public class QueryMapper {
@@ -632,7 +633,7 @@ private static String getUniqueName(MapSqlParameterSource parameterSource, Strin
 			return name;
 		}
 
-		int counter = 1;
+		int counter = values.size();
 		String uniqueName;
 
 		do {
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/QueryMapperUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/QueryMapperUnitTests.java
index d7ad16364c..a67da7397f 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/QueryMapperUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/QueryMapperUnitTests.java
@@ -46,6 +46,7 @@
  *
  * @author Mark Paluch
  * @author Jens Schauder
+ * @author Mikhail Fedorov
  */
 public class QueryMapperUnitTests {
 
@@ -121,7 +122,7 @@ public void shouldMapNestedGroup() {
 		Condition condition = map(criteria);
 
 		assertThat(condition).hasToString(
-				"(person.\"NAME\" = ?[:name]) AND (person.\"NAME\" = ?[:name1] OR person.age < ?[:age] OR (person.\"NAME\" != ?[:name2] AND person.age > ?[:age1]))");
+				"(person.\"NAME\" = ?[:name]) AND (person.\"NAME\" = ?[:name1] OR person.age < ?[:age] OR (person.\"NAME\" != ?[:name3] AND person.age > ?[:age4]))");
 	}
 
 	@Test // DATAJDBC-318