diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
index f159a73a1..36f062841 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
@@ -851,7 +851,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		Class<?> documentsTargetType = getDefaultedTypeToBeUsed(dbObject);
 		Class<S> rawType = basicType == null ? null : basicType.getType();
 
-		boolean isMoreConcreteCustomType = rawType == null ? false : rawType.isAssignableFrom(documentsTargetType);
+		boolean isMoreConcreteCustomType = rawType == null ? true : rawType.isAssignableFrom(documentsTargetType) && !rawType.equals(documentsTargetType);
 		return isMoreConcreteCustomType ? (TypeInformation<? extends S>) ClassTypeInformation.from(documentsTargetType)
 				: basicType;
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
index 5b546e917..8d404919e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
@@ -624,6 +624,49 @@ public class MappingMongoConverterUnitTests {
 		assertThat((String)((Map<?,?>) firstObjectInFoo).get("Hello"), is(equalTo("World")));
 	}
 	
+
+	/**
+	 * @see DATADOC-245
+	 */
+	@Test
+	public void readsMapDoublyNestedValuesCorrectly() {
+
+		BasicDBObject nested = new BasicDBObject();
+		BasicDBObject doubly = new BasicDBObject();
+		doubly.append("Hello", "World");
+		nested.append("nested", doubly);
+		DBObject source = new BasicDBObject("mapOfObjects", new BasicDBObject("Foo", nested));
+
+		ClassWithMapProperty result = converter.read(ClassWithMapProperty.class, source);
+		Object foo = result.mapOfObjects.get("Foo");
+		assertThat(foo, is(instanceOf(Map.class)));
+		Object doublyNestedObject = ((Map<?, ?>) foo).get("nested");
+		assertThat(doublyNestedObject, is(instanceOf(Map.class)));
+		assertThat((String) ((Map<?, ?>) doublyNestedObject).get("Hello"), is(equalTo("World")));
+	}
+
+	/**
+	 * @see DATADOC-245
+	 */
+	@Test
+	public void readsMapListDoublyNestedValuesCorrectly() {
+
+		BasicDBList list = new BasicDBList();
+		BasicDBObject nested = new BasicDBObject();
+		BasicDBObject doubly = new BasicDBObject();
+		doubly.append("Hello", "World");
+		nested.append("nested", doubly);
+		list.add(nested);
+		DBObject source = new BasicDBObject("mapOfObjects", new BasicDBObject("Foo", list));
+
+		ClassWithMapProperty result = converter.read(ClassWithMapProperty.class, source);
+		Object firstObjectInFoo = ((List<?>) result.mapOfObjects.get("Foo")).get(0);
+		assertThat(firstObjectInFoo, is(instanceOf(Map.class)));
+		Object doublyNestedObject = ((Map<?, ?>) firstObjectInFoo).get("nested");
+		assertThat(doublyNestedObject, is(instanceOf(Map.class)));
+		assertThat((String) ((Map<?, ?>) doublyNestedObject).get("Hello"), is(equalTo("World")));
+	}
+
 	class GenericType<T> {
 		T content;
 	}