diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index 47e9dbd85..4db922024 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -239,7 +239,7 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 			result.add(persistentProperty);
 
 			if (iterator.hasNext()) {
-				current = getPersistentEntity(persistentProperty.getActualType());
+				current = getPersistentEntity(persistentProperty.getTypeInformation().getActualType());
 			}
 		}
 
diff --git a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
index 7ec9bea92..01bc065c1 100644
--- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
@@ -25,6 +25,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.TreeMap;
 
+import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -245,6 +246,15 @@ public class AbstractMappingContextUnitTests {
 		assertHasEntityFor(TreeMap.class, context, false);
 	}
 
+	/**
+	 * @see DATACMNS-695
+	 */
+	@Test
+	public void persistentPropertyPathTraversesGenericTypesCorrectly() {
+		assertThat(context.getPersistentPropertyPath("field.wrapped.field", Outer.class),
+				is(Matchers.<SamplePersistentProperty> iterableWithSize(3)));
+	}
+
 	private static void assertHasEntityFor(Class<?> type, SampleMappingContext context, boolean expected) {
 
 		boolean found = false;
@@ -283,4 +293,17 @@ public class AbstractMappingContextUnitTests {
 	static class Extension extends Base {
 		@Id String foo;
 	}
+
+	static class Outer {
+
+		Wrapper<Inner> field;
+	}
+
+	static class Wrapper<T> {
+		T wrapped;
+	}
+
+	static class Inner {
+		String field;
+	}
 }