diff --git a/app/lib/controller/collection_items_controller.dart b/app/lib/controller/collection_items_controller.dart
index 1c2a869a..bf87bcd2 100644
--- a/app/lib/controller/collection_items_controller.dart
+++ b/app/lib/controller/collection_items_controller.dart
@@ -205,7 +205,7 @@ class CollectionItemsController {
             ?.run((e) => _dataStreamController.addError(e.error, e.stackTrace));
         if (failed.isNotEmpty) {
           _dataStreamController.addWithValue((value) => value.copyWith(
-                items: value.items + failed,
+                items: [...value.items, ...failed],
               ));
         }
       } else if (isInited != _isDataStreamInited) {
@@ -265,7 +265,7 @@ class CollectionItemsController {
             ?.run((e) => _dataStreamController.addError(e.error, e.stackTrace));
         if (failed.isNotEmpty) {
           _dataStreamController.addWithValue((value) => value.copyWith(
-                items: value.items + failed,
+                items: [...value.items, ...failed],
               ));
         }
       } else if (isInited != _isDataStreamInited) {
diff --git a/app/lib/use_case/nc_album/remove_from_nc_album.dart b/app/lib/use_case/nc_album/remove_from_nc_album.dart
index dd3a660c..d9c6bb98 100644
--- a/app/lib/use_case/nc_album/remove_from_nc_album.dart
+++ b/app/lib/use_case/nc_album/remove_from_nc_album.dart
@@ -4,7 +4,6 @@ import 'package:nc_photos/account.dart';
 import 'package:nc_photos/debug_util.dart';
 import 'package:nc_photos/di_container.dart';
 import 'package:nc_photos/entity/collection_item.dart';
-import 'package:nc_photos/entity/collection_item/basic_item.dart';
 import 'package:nc_photos/entity/file_descriptor.dart';
 import 'package:nc_photos/entity/nc_album.dart';
 import 'package:nc_photos/use_case/remove.dart';
@@ -29,7 +28,7 @@ class RemoveFromNcAlbum {
         "[call] Remove ${items.length} items from album '${album.strippedPath}'");
     final fileItems = items
         .whereIndexed((i, e) {
-          if (e is! BasicCollectionFileItem) {
+          if (e is! CollectionFileItem) {
             onError?.call(
               i,
               e,
@@ -41,7 +40,7 @@ class RemoveFromNcAlbum {
             return true;
           }
         })
-        .cast<BasicCollectionFileItem>()
+        .cast<CollectionFileItem>()
         .toList();
     var count = fileItems.length;
     await Remove(_c)(