diff --git a/Common/FileDownloader/FileDownloader_curl.cpp b/Common/FileDownloader/FileDownloader_curl.cpp
index 70e2bfce3b..115dd8647b 100644
--- a/Common/FileDownloader/FileDownloader_curl.cpp
+++ b/Common/FileDownloader/FileDownloader_curl.cpp
@@ -97,7 +97,12 @@ public :
 
         m_bComplete = (CURLE_OK == res);
         if (m_bComplete)
-            m_sFilePath = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sOut.c_str(), sOut.length());
+        {
+            if (m_sFilePath.empty())
+                m_sFilePath = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sOut.c_str(), sOut.length());
+            else
+                NSFile::CFileBinary::Move(UTF8_TO_U(sOut), m_sFilePath);
+        }
         //int nRes = execl("/usr/bin/wget", stringWstingToUtf8String (m_sFileUrl).c_str(), "-P", stringWstingToUtf8String (m_sFilePath).c_str(), (char *)NULL);
         //m_bComplete = nRes >= 0;
 
diff --git a/Common/FileDownloader/FileDownloader_win.cpp b/Common/FileDownloader/FileDownloader_win.cpp
index e02fc446b2..5b0ec99b3b 100644
--- a/Common/FileDownloader/FileDownloader_win.cpp
+++ b/Common/FileDownloader/FileDownloader_win.cpp
@@ -70,7 +70,7 @@ public :
     virtual int DownloadFile()
     {
         CoInitialize ( NULL );
-        if ( S_OK != _DownloadFile ( m_sFileUrl ) )
+        if ( /*S_OK != _DownloadFile ( m_sFileUrl )*/TRUE )
         {
             HRESULT hrResultAll = DownloadFileAll(m_sFileUrl, m_sFilePath);
 
diff --git a/DesktopEditor/doctrenderer/docbuilder_p.h b/DesktopEditor/doctrenderer/docbuilder_p.h
index 05e7c02704..7315c1826e 100644
--- a/DesktopEditor/doctrenderer/docbuilder_p.h
+++ b/DesktopEditor/doctrenderer/docbuilder_p.h
@@ -939,7 +939,7 @@ namespace NSDoctRenderer
             MoveFileOpen(path, sFileCopy);
 
             COfficeFileFormatChecker oChecker;
-            if (!oChecker.isOfficeFile(path))
+            if (!oChecker.isOfficeFile(sFileCopy))
                 return false;
 
             if (oChecker.nFileType & AVS_OFFICESTUDIO_FILE_DOCUMENT)
diff --git a/DesktopEditor/doctrenderer/doctrenderer.cpp b/DesktopEditor/doctrenderer/doctrenderer.cpp
index 26db25e3d2..af6cd79931 100644
--- a/DesktopEditor/doctrenderer/doctrenderer.cpp
+++ b/DesktopEditor/doctrenderer/doctrenderer.cpp
@@ -1194,5 +1194,5 @@ bool Doct_renderer_SaveFile_ForBuilder(int nFormat, const std::wstring& strDstFi
     oParams.m_strDstFilePath = strDstFile;
 
     return NSDoctRenderer::CDoctRenderer_Private::Doct_renderer_SaveFile(&oParams,
-            pNative, isolate, global_js, args, try_catch, strError, true);
+            pNative, isolate, global_js, args, try_catch, strError, false);
 }