diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java
index 758a625a6..64a4e9383 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2010 the original author or authors.
+ * Copyright 2008-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,11 +54,9 @@ public class ParametersParameterAccessor implements ParameterAccessor {
 
 
 	/*
-			 * (non-Javadoc)
-			 *
-			 * @see
-			 * org.springframework.data.repository.query.ParameterAccessor#getPageable()
-			 */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#getPageable()
+	 */
 	public Pageable getPageable() {
 
 		if (!parameters.hasPageableParameter()) {
@@ -70,11 +68,9 @@ public class ParametersParameterAccessor implements ParameterAccessor {
 
 
 	/*
-			 * (non-Javadoc)
-			 *
-			 * @see
-			 * org.springframework.data.repository.query.ParameterAccessor#getSort()
-			 */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#getSort()
+	 */
 	public Sort getSort() {
 
 		if (parameters.hasSortParameter()) {
@@ -90,12 +86,9 @@ public class ParametersParameterAccessor implements ParameterAccessor {
 
 
 	/*
-			 * (non-Javadoc)
-			 *
-			 * @see
-			 * org.springframework.data.repository.query.ParameterAccessor#getBindableValue
-			 * (int)
-			 */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int)
+	 */
 	public Object getBindableValue(int index) {
 
 		return values[parameters.getBindableParameter(index).getIndex()];
@@ -103,11 +96,9 @@ public class ParametersParameterAccessor implements ParameterAccessor {
 
 
 	/*
-			 * (non-Javadoc)
-			 *
-			 * @see
-			 * org.springframework.data.repository.query.ParameterAccessor#iterator()
-			 */
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParameterAccessor#iterator()
+	 */
 	public BindableParameterIterator iterator() {
 
 		return new BindableParameterIterator();
@@ -136,21 +127,19 @@ public class ParametersParameterAccessor implements ParameterAccessor {
 
 
 		/*
-						 * (non-Javadoc)
-						 *
-						 * @see java.util.Iterator#hasNext()
-						 */
+		 * (non-Javadoc)
+		 * @see java.util.Iterator#hasNext()
+		 */
 		public boolean hasNext() {
 
-			return values.length <= currentIndex;
+			return values.length > currentIndex;
 		}
 
 
 		/*
-						 * (non-Javadoc)
-						 *
-						 * @see java.util.Iterator#remove()
-						 */
+		 * (non-Javadoc)
+		 * @see java.util.Iterator#remove()
+		 */
 		public void remove() {
 
 			throw new UnsupportedOperationException();
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/repository/query/ParametersParameterAccessorUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/repository/query/ParametersParameterAccessorUnitTests.java
new file mode 100644
index 000000000..190e4d670
--- /dev/null
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/repository/query/ParametersParameterAccessorUnitTests.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.repository.query;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Iterator;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link ParametersParameterAccessor}.
+ *
+ * @author Oliver Gierke
+ */
+public class ParametersParameterAccessorUnitTests {
+
+	
+	@Test
+	public void accessorIteratorHasNext() throws SecurityException, NoSuchMethodException {
+		
+		Parameters parameters = new Parameters(Sample.class.getMethod("method", String.class, int.class));
+		ParameterAccessor accessor = new ParametersParameterAccessor(parameters, new Object[] { "Foo", 2});
+		
+		Iterator<Object> iterator = accessor.iterator();
+		assertThat(iterator.hasNext(), is(true));
+		assertThat(iterator.next(), is((Object) "Foo"));
+		assertThat(iterator.hasNext(), is(true));
+		assertThat(iterator.next(), is((Object) 2));
+		assertThat(iterator.hasNext(), is(false));
+	}
+	
+	
+	interface Sample {
+		
+		void method(String string, int integer);
+	}
+}