diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentProperty.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentProperty.java
index 6ce822ae5..afc860d88 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentProperty.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentProperty.java
@@ -128,13 +128,13 @@ public class BasicPersistentProperty implements PersistentProperty {
 
   @Override
   public boolean isCollection() {
-    return getType().isAssignableFrom(Collection.class) || getType().isAssignableFrom(List.class) || isArray();
+    return Collection.class.isAssignableFrom(getType()) || isArray();
   }
   
   
   @Override
   public boolean isMap() {
-    return getType().isAssignableFrom(Map.class);
+    return Map.class.isAssignableFrom(getType());
   }
   
   /* (non-Javadoc)
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java
index fcc77a3ec..b9d7609a1 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java
@@ -84,7 +84,7 @@ public abstract class MappingBeanHelper {
         return true;
       }
     }
-    return false;
+    return type.isEnum();
   }
 
   public static <T> T constructInstance(PersistentEntity<T> entity,