diff --git a/pom.xml b/pom.xml
index a23acc8c2..aa5514471 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<properties>
 		<jackson>1.9.7</jackson>
 		<jackson2>2.2.2</jackson2>
-		<springhateoas>0.6.0.RELEASE</springhateoas>
+		<springhateoas>0.8.0.BUILD-SNAPSHOT</springhateoas>
 		<dist.key>DATACMNS</dist.key>
 	</properties>
 	
diff --git a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java
index 86c02cfac..c9dc781ad 100644
--- a/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java
+++ b/src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java
@@ -19,6 +19,7 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -100,6 +101,21 @@ public class PagedResourcesAssemblerUnitTests {
 		assertThat(resources.getLink(Link.REL_NEXT).getHref(), startsWith(link.getHref()));
 	}
 
+	/**
+	 * @see DATACMNS-358
+	 */
+	@Test
+	public void createsPagedResourcesForOneIndexedArgumentResolver() {
+
+		resolver.setOneIndexedParameters(true);
+		PagedResourcesAssembler<Person> assembler = new PagedResourcesAssembler<Person>(resolver, null);
+
+		PageRequest request = new PageRequest(0, 1);
+		Page<Person> page = new PageImpl<Person>(Collections.<Person> emptyList(), request, 0);
+
+		assembler.toResource(page);
+	}
+
 	private static Page<Person> createPage(int index) {
 
 		PageRequest request = new PageRequest(index, 1);