diff --git a/TODO b/TODO
index c111ab863..ff87d6aa2 100644
--- a/TODO
+++ b/TODO
@@ -57,6 +57,7 @@
 - Translations update (IN PROGRESS)
 - add qt4-qtconfig as package dependency
 - use new sparse mode
+- wait for Ticket #182 Fix
 
 rc4->rc5 changelog:
 - BUGFIX: Now filtered don't appear on hard drive anymore (libtorrent >= r1659)
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index e8244c92c..b055ff7a5 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -144,12 +144,12 @@ void bittorrent::updateETAs() {
       if(h.is_paused()) continue;
       QString hash = h.hash();
       QList<qlonglong> listEtas = ETAstats.value(hash, QList<qlonglong>());
-      if(listEtas.size() == ETAS_MAX_VALUES) {
-          listEtas.removeFirst();
-      }
       // XXX: We can still get an overflow if remaining file size is approximately
-      // 8.38*10^5 TiB (lets assume this can't happen)
+      // 8.38*10^5 TiB (let's assume this can't happen)
       if(h.download_payload_rate() > 0.1) {
+        if(listEtas.size() == ETAS_MAX_VALUES) {
+            listEtas.removeFirst();
+        }
         listEtas << (qlonglong)((h.actual_size()-h.total_wanted_done())/(double)h.download_payload_rate());
         ETAstats[hash] = listEtas;
         qlonglong moy = 0;
@@ -162,9 +162,9 @@ void bittorrent::updateETAs() {
         }
         ETAs[hash] = moy;
       } else {
-        // Speed is too low, we don't want overflow.
+        // Speed is too low, we don't want an overflow.
         if(ETAstats.contains(hash)) {
-          ETAs.remove(hash);
+          ETAstats.remove(hash);
         }
         if(ETAs.contains(hash)) {
           ETAs.remove(hash);