diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 428e43ac5..f1ecdeb9b 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -456,11 +456,7 @@ void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url, bo
   p.duplicate_is_error = false; // Already checked
   p.auto_managed = false; // Because it is added in paused state
   // Adding torrent to bittorrent session
-  h =  s->add_torrent(p);
-  // XXX: Workaround for http://code.rasterbar.com/libtorrent/ticket/454
-  h.pause(false);
-  //Q_ASSERT(!h.is_auto_managed());
-  //Q_ASSERT(h.is_paused());
+  h =  QTorrentHandle(s->add_torrent(p));
   // Check if it worked
   if(!h.is_valid()) {
       // No need to keep on, it failed.
@@ -806,7 +802,7 @@ void bittorrent::saveFastResumeData() {
   for(unsigned int i=0; i<torrents.size(); ++i) {
     QTorrentHandle h(torrents[i]);
     if(!h.is_valid()) continue;
-    if(h.is_paused()) continue;
+    //if(h.is_paused()) continue;
     if (!h.has_metadata()) continue;
     if(h.state() == torrent_status::checking_files || h.state() == torrent_status::queued_for_checking) continue;
     h.save_resume_data();
diff --git a/src/qtorrenthandle.cpp b/src/qtorrenthandle.cpp
index a9e86d6c0..a426d2782 100644
--- a/src/qtorrenthandle.cpp
+++ b/src/qtorrenthandle.cpp
@@ -315,12 +315,12 @@ void QTorrentHandle::set_upload_limit(int limit) {
   h.set_upload_limit(limit);
 }
 
-void QTorrentHandle::pause(bool create_file) {
+void QTorrentHandle::pause() {
   Q_ASSERT(h.is_valid());
   h.auto_managed(false);
   h.pause();
   // Create .paused file if necessary
-  if(create_file && !QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash()+".paused")) {
+  if(!QFile::exists(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash()+".paused")) {
         QFile paused_file(misc::qBittorrentPath()+"BT_backup"+QDir::separator()+hash()+".paused");
         paused_file.open(QIODevice::WriteOnly | QIODevice::Text);
         paused_file.close();
diff --git a/src/qtorrenthandle.h b/src/qtorrenthandle.h
index 1948196c8..20d4920af 100644
--- a/src/qtorrenthandle.h
+++ b/src/qtorrenthandle.h
@@ -103,7 +103,7 @@ class QTorrentHandle {
 
     void set_download_limit(int limit);
     void set_upload_limit(int limit);
-    void pause(bool create_file=true);
+    void pause();
     void resume();
     void remove_url_seed(QString seed);
     void add_url_seed(QString seed);