diff --git a/ChangeLog b/ChangeLog
index 398dcd707..a23ef3ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+=== Deluge 1.1.8 - (In Development) ===
+  * Fix pause all/resume all
+
 === Deluge 1.1.7 - (25 April 2009) ===
 ==== Core ====
   * Fix issue where cannot resume torrent after doing a 'Pause All'
diff --git a/deluge/core/core.py b/deluge/core/core.py
index 9c0ce2c08..7ca47d830 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -519,12 +519,12 @@ class Core(
 
     def export_pause_all_torrents(self):
         """Pause all torrents in the session"""
-        for torrent in self.torrentmanager.torrents.values():
+        for torrent in self.torrents.torrents.values():
             torrent.pause()
 
     def export_resume_all_torrents(self):
         """Resume all torrents in the session"""
-        for torrent in self.torrentmanager.torrents.values():
+        for torrent in self.torrents.torrents.values():
             torrent.resume()
         self.signals.emit("torrent_all_resumed")