diff --git a/app/src/main/java/com/hippo/ehviewer/miscellaneous/Downloader.java b/app/src/main/java/com/hippo/ehviewer/miscellaneous/Downloader.java
index e771ce516..5d3c16b20 100644
--- a/app/src/main/java/com/hippo/ehviewer/miscellaneous/Downloader.java
+++ b/app/src/main/java/com/hippo/ehviewer/miscellaneous/Downloader.java
@@ -46,6 +46,10 @@ public class Downloader implements Runnable, HttpHelper.OnDownloadListener {
 
     @Override
     public void run() {
+        HttpHelper.DownloadOption dOpt = new HttpHelper.DownloadOption();
+        dOpt.setUseProxy(false);
+        dOpt.setAllowFixingExtension(true);
+        dOpt.setAllowFixingName(true);
         HttpHelper hh = new HttpHelper(mContext);
         final boolean ok = HttpHelper.DOWNLOAD_OK_STR.equals(
                 hh.download(mUrl, mDir, mFilename, null, null, this));
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryDetailActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryDetailActivity.java
index 197ced704..24b71ff34 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryDetailActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryDetailActivity.java
@@ -89,6 +89,7 @@ import com.hippo.ehviewer.util.AppConfig;
 import com.hippo.ehviewer.util.Config;
 import com.hippo.ehviewer.util.Constants;
 import com.hippo.ehviewer.util.Ui;
+import com.hippo.ehviewer.util.Utils;
 import com.hippo.ehviewer.util.ViewUtils;
 import com.hippo.ehviewer.widget.AutoWrapLayout;
 import com.hippo.ehviewer.widget.FitWindowView;
@@ -1175,11 +1176,11 @@ public class GalleryDetailActivity extends AbsTranslucentActivity
                             }
 
                             final String url = galleryDetail.torrents[position].first;
+                            String name = galleryDetail.torrents[position].second;
                             Downloader d = new Downloader(
                                     GalleryDetailActivity.this,
                                     url,
-                                    dir,
-                                    "a.torrent"); // Torrent will be updated
+                                    dir, Utils.standardizeFilename(name + ".torrent")); // Torrent will be updated
                             d.startDownload();
                         }
                     });