diff --git a/src/main/java/org/springframework/data/repository/query/ReturnedType.java b/src/main/java/org/springframework/data/repository/query/ReturnedType.java
index 62d18c72a..0878ed150 100644
--- a/src/main/java/org/springframework/data/repository/query/ReturnedType.java
+++ b/src/main/java/org/springframework/data/repository/query/ReturnedType.java
@@ -296,6 +296,7 @@ public abstract class ReturnedType {
 			return !Object.class.equals(type) && //
 					!isDomainSubtype() && //
 					!isPrimitiveOrWrapper() && //
+					!Number.class.isAssignableFrom(type) && //
 					!VOID_TYPES.contains(type) && //
 					!type.getPackage().getName().startsWith("java.lang");
 		}
diff --git a/src/test/java/org/springframework/data/repository/query/ReturnedTypeUnitTests.java b/src/test/java/org/springframework/data/repository/query/ReturnedTypeUnitTests.java
index 3f42c3632..7846ffe81 100644
--- a/src/test/java/org/springframework/data/repository/query/ReturnedTypeUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/query/ReturnedTypeUnitTests.java
@@ -19,6 +19,7 @@ import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 import java.lang.reflect.Method;
+import java.math.BigInteger;
 import java.util.List;
 
 import org.junit.Test;
@@ -116,6 +117,19 @@ public class ReturnedTypeUnitTests {
 		assertThat(type.getTypeToRead(), is(typeCompatibleWith(Sample.class)));
 	}
 
+	/**
+	 * @see DATACMNS-89
+	 */
+	@Test
+	public void detectsComplexNumberTypes() throws Exception {
+
+		ReturnedType type = getReturnedType("countQuery");
+
+		assertThat(type.isProjecting(), is(false));
+		assertThat(type.needsCustomConstruction(), is(false));
+		assertThat(type.getTypeToRead(), is(typeCompatibleWith(BigInteger.class)));
+	}
+
 	private static ReturnedType getReturnedType(String methodName, Class<?>... parameters) throws Exception {
 		return getQueryMethod(methodName, parameters).getResultProcessor().getReturnedType();
 	}
@@ -146,6 +160,8 @@ public class ReturnedTypeUnitTests {
 		OpenProjection findOneOpenProjection();
 
 		Page<SampleProjection> findPageProjection(Pageable pageable);
+
+		BigInteger countQuery();
 	}
 
 	static class Sample {