diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
index 244f584..7a7ebf3 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -330,8 +330,8 @@ enum AnnotationBasedKeySpaceResolver implements KeySpaceResolver {
 				this.declaringClass = declaringClass;
 				this.composedAnnotation = composedAnnotation;
 				this.annotation = annotation;
-				this.annotationAttributes = AnnotatedElementUtils.getMergedAnnotationAttributes(rootDeclaringClass, annotation
-						.annotationType().getName());
+				this.annotationAttributes = AnnotatedElementUtils.findMergedAnnotationAttributes(rootDeclaringClass,
+						annotation.annotationType(), false, false);
 			}
 
 			public Class<?> getRootDeclaringClass() {