diff --git a/DBCamera/Controllers/DBCameraCollectionViewController.m b/DBCamera/Controllers/DBCameraCollectionViewController.m
index 789ab03..65fcafe 100644
--- a/DBCamera/Controllers/DBCameraCollectionViewController.m
+++ b/DBCamera/Controllers/DBCameraCollectionViewController.m
@@ -71,11 +71,11 @@ - (UICollectionViewCell *) collectionView:(UICollectionView *)collectionView cel
     [item.itemImage setImage:nil];
     
     if ( _items.count > 0) {
-        __weak DBCollectionViewCell *blockItem = item;
-        [[[DBLibraryManager sharedInstance] defaultAssetsLibrary] assetForURL:(NSURL *)_items[indexPath.item]  resultBlock:^(ALAsset *asset) {
-            UIImage *image = [UIImage imageWithCGImage:[asset thumbnail]];
-            [blockItem.itemImage setImage:image];
-        } failureBlock:nil];
+        ALAsset *asset = _items[indexPath.item];
+        CGImageRef thumbnailImageRef = [asset thumbnail];
+        UIImage *thumbnail = [UIImage imageWithCGImage:thumbnailImageRef];
+
+        item.itemImage.image = thumbnail;
     }
     
     return item;
@@ -90,7 +90,7 @@ - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollection
 
 - (void) collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    [_collectionControllerDelegate collectionView:collectionView itemURL:(NSURL *)_items[indexPath.item]];
+    [_collectionControllerDelegate collectionView:collectionView itemURL:(NSURL *)[[asset defaultRepresentation] url]];
 }
 
 @end
\ No newline at end of file
diff --git a/DBCamera/Managers/DBLibraryManager.m b/DBCamera/Managers/DBLibraryManager.m
index a9b6eb1..f4df990 100644
--- a/DBCamera/Managers/DBLibraryManager.m
+++ b/DBCamera/Managers/DBLibraryManager.m
@@ -83,6 +83,10 @@ - (ALAssetsLibraryGroupsEnumerationResultsBlock) assetGroupEnumerator
     __block GroupsCompletionBlock block = _groupsCompletionBlock;
     
     ALAssetsLibraryGroupsEnumerationResultsBlock groupsEnumerator = ^(ALAssetsGroup *group, BOOL *stop){
+        ALAssetsFilter *onlyPhotosFilter = [ALAssetsFilter allPhotos];
+
+        [group setAssetsFilter:onlyPhotosFilter];
+
         if ( group ) {
             if ( group.numberOfAssets > 0 ) {
                 [weakSelf setUsedGroup:group];
@@ -111,12 +115,9 @@ - (ALAssetsGroupEnumerationResultsBlock) assetsEnumerator
     
     ALAssetsGroupEnumerationResultsBlock assetsEnumerator = ^(ALAsset *result, NSUInteger index, BOOL *stop) {
         if ( result ) {
-            if( [[result valueForProperty:ALAssetPropertyType] isEqualToString:ALAssetTypePhoto] ) {
-                if ( [result defaultRepresentation] ) {
-                    [items addObject:[[result defaultRepresentation] url]];
-                    assetResult = result;
-                }
-            }
+            [items addObject:result];
+
+            assetResult = result;
         } else {
             *stop = YES;