diff --git a/CPP/7zip/UI/Agent/ArchiveFolder.cpp b/CPP/7zip/UI/Agent/ArchiveFolder.cpp
index 1ad8dd57..843a6d89 100644
--- a/CPP/7zip/UI/Agent/ArchiveFolder.cpp
+++ b/CPP/7zip/UI/Agent/ArchiveFolder.cpp
@@ -43,7 +43,7 @@ STDMETHODIMP CAgentFolder::CopyTo(Int32 moveMode, const UInt32 *indices, UInt32
       NExtract::NPathMode::kNoPaths;
 
   Int64 soleFolderIndex;
-  extractCallback2->GetSoleFolderIndex(&soleFolderIndex);
+  callback->GetSoleFolderIndex(&soleFolderIndex);
 
   return Extract(indices, numItems,
       includeAltStreams, replaceAltStreamCharsMode,
diff --git a/CPP/7zip/UI/Agent/IFolderArchive.h b/CPP/7zip/UI/Agent/IFolderArchive.h
index 92eb6160..6395a4af 100644
--- a/CPP/7zip/UI/Agent/IFolderArchive.h
+++ b/CPP/7zip/UI/Agent/IFolderArchive.h
@@ -28,6 +28,7 @@ IArchiveFolder is used by:
   STDMETHOD(Extract)(const UInt32 *indices, UInt32 numItems, \
       Int32 includeAltStreams, \
       Int32 replaceAltStreamCharsMode, \
+      Int64 soleFolderIndex, \
       NExtract::NPathMode::EEnum pathMode, \
       NExtract::NOverwriteMode::EEnum overwriteMode, \
       const wchar_t *path, Int32 testMode, \
diff --git a/CPP/7zip/UI/FileManager/PanelCopy.cpp b/CPP/7zip/UI/FileManager/PanelCopy.cpp
index 86df47e9..077fe3df 100644
--- a/CPP/7zip/UI/FileManager/PanelCopy.cpp
+++ b/CPP/7zip/UI/FileManager/PanelCopy.cpp
@@ -99,9 +99,9 @@ HRESULT CPanelCopyThread::ProcessVirt()
         options->folder, BoolToInt(true), extractCallback2);
   }
   else
-    CMyComPtr<IFolderArchiveExtractCallback> extractCallback2;
-    RINOK(ExtractCallback.QueryInterface(IID_IFolderArchiveExtractCallback, &extractCallback2))
-    extractCallback2->SetSoleFolderIndex(options->soleFolderIndex);
+    // CMyComPtr<IFolderArchiveExtractCallback> extractCallback2;
+    // RINOK(ExtractCallback.QueryInterface(IID_IFolderArchiveExtractCallback, &extractCallback2))
+    ExtractCallback->SetSoleFolderIndex(options->soleFolderIndex);
     result2 = FolderOperations->CopyTo(
       BoolToInt(options->moveMode),
       &Indices.Front(), Indices.Size(),