Fix issue when collection is updated before the drop