diff --git a/ChangeLog b/ChangeLog
index 37a0ef551..4383a9332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Deluge 0.9.09 - "1.0.0_RC9" (In Development)
  GtkUI:
   * Fix add torrent dialog closing preventing another dialog from being shown
   * Fix various issues when not using English
+  * Fix fastresume issue causing loss of data
 
 Deluge 0.9.08 - "1.0.0_RC8" (27 August 2008)
  Core:
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 3c2e4b6a8..150c04d33 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -563,7 +563,9 @@ class TorrentManager(component.Component):
     def save_resume_data(self):
         """Saves resume data for all the torrents"""
         for torrent in self.torrents.values():
-            torrent.write_fastresume()
+            if not torrent.is_finished:
+                torrent.delete_fastresume()
+                torrent.write_fastresume()
             
     def queue_top(self, torrent_id):
         """Queue torrent to top"""
@@ -645,7 +647,9 @@ class TorrentManager(component.Component):
         component.get("SignalManager").emit("torrent_paused", torrent_id)
             
         # Write the fastresume file
-        self.torrents[torrent_id].write_fastresume()
+        if not self.torrents[torrent_id].is_finished:
+            self.torrents[torrent_id].delete_fastresume()
+            self.torrents[torrent_id].write_fastresume()
         
         if torrent_id in self.shutdown_torrent_pause_list:
             self.shutdown_torrent_pause_list.remove(torrent_id)