diff --git a/pom.xml b/pom.xml
index 868434131..1232007a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.5.0.RELEASE</springdata.commons>
+		<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
 		<mongo>2.10.1</mongo>
 	</properties>
 	
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
index ab2961dcb..f74bee23b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
@@ -63,7 +63,8 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
 
 		Path<?> parent = metadata.getParent();
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(parent.getType());
-		MongoPersistentProperty property = entity.getPersistentProperty(metadata.getExpression().toString());
+		MongoPersistentProperty property = entity.getPersistentProperty(metadata.getName());
+
 		return property == null ? super.getKeyForPath(expr, metadata) : property.getFieldName();
 	}