diff --git a/Classes/NSManagedObject+Mappings.m b/Classes/NSManagedObject+Mappings.m
index 52adc45..0607f93 100644
--- a/Classes/NSManagedObject+Mappings.m
+++ b/Classes/NSManagedObject+Mappings.m
@@ -62,7 +62,7 @@ + (id)objectOrSetOfObjectsFromValue:(id)value ofClass:class inContext:(NSManaged
     if ([value isKindOfClass:[NSDictionary class]])
         return [class findOrCreate:value inContext:context];
 
-    if ([value isKindOfClass:[NSArray class]])
+    if ([value isKindOfClass:[NSArray class]] || [value isKindOfClass:[NSSet class]])
         return [NSSet setWithArray:[value map:^id(id object) {
             return [self objectOrSetOfObjectsFromValue:object ofClass:class inContext:context];
         }]];