             
             let photoStatus:MPhotos.Status = firebasePhoto.status
             let photoCreated:TimeInterval = firebasePhoto.created
-            let albumId:AlbumId = firebasePhoto.album
+            let albumId:AlbumId = firebasePhoto.albumId
+            let album:MPhotosItem?
+            
+            if albumId.isEmpty
+            {
+                album = defaultAlbum
+            }
+            else
+            {
+                album = albumItems[albumId]
+            }
             
             if photoStatus == Status.synced
             {
-                
                 if let loadedItem:MPhotosItemPhoto = self.photos[photoId]
                 {
                     items[photoId] = loadedItem

                    photoId:photoId,
                    created:photoCreated)
                
                references.append(photoReference)
            }
            else
            {

    
    private func asyncCleanResources()
    {
        let allPhotos:[PhotoId] = Array(photos.keys)
        
        for photoId:PhotoId in allPhotos
        {
            let photo:MPhotosItemPhoto? = photos[photoId]
            photo?.resources.cleanResources()
        }
    }
    
