diff --git a/ChangeLog b/ChangeLog
index 91843b20..941adc65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-16  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	* src/ConsoleCalc.cc (calculateStat): Hide SPD after the download
+	finished.
+
 2007-10-15  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	* src/Metalink2RequestGroup.cc (generate): Throw exception instead of
diff --git a/TODO b/TODO
index 59dca5a3..f100a7e6 100644
--- a/TODO
+++ b/TODO
@@ -52,4 +52,4 @@
 
 * Implement duplicate download checking in Bt
 * Implement the feature to treat http/ftp as auxuality download method for BitTorrent
-
+* Add PeerListenCommand to DownloadEngine only when it is really necessary.
diff --git a/src/ConsoleStatCalc.cc b/src/ConsoleStatCalc.cc
index d30ce945..99a6300e 100644
--- a/src/ConsoleStatCalc.cc
+++ b/src/ConsoleStatCalc.cc
@@ -79,9 +79,11 @@ ConsoleStatCalc::calculateStat(const RequestGroupManHandle& requestGroupMan,
     cout << " "
 	 << "CN:"
 	 << firstRequestGroup->getNumConnection();
-    cout << " "
-	 << "SPD:"
-	 << fixed << setprecision(2) << stat.getDownloadSpeed()/1024.0 << "KiB/s";
+    if(!firstRequestGroup->downloadFinished()) {
+      cout << " "
+	   << "SPD:"
+	   << fixed << setprecision(2) << stat.getDownloadSpeed()/1024.0 << "KiB/s";
+    }
     if(stat.getSessionUploadLength() > 0) {
       cout << " "
 	   << "UP:"