diff --git a/ChangeLog b/ChangeLog
index fe14ff0d9..7107e3c29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Deluge 0.9.07 - "1.0.0_RC7" (18 August 2008)
   * Fix loading torrents from state when fastresume file is missing
   * Fix UPnP
   * Fix to prevent Deluge from segfaulting when trying to autoadd an incomplete torrent file
+  * Fix #407 possible negative ETA
 
  GtkUI:
   * Add 'edit' to edit trackers dialog
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 714bef732..a18229969 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -279,7 +279,7 @@ class Torrent:
         
         left = status.total_wanted - status.total_done
         
-        if left == 0 or status.download_payload_rate == 0:
+        if left <= 0 or status.download_payload_rate == 0:
             return 0
         
         try: