diff --git a/ChangeLog b/ChangeLog
index 347bc345..a28c68e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed the bug that socket is added to EventPoll object twice. This
+	is because derived class FtpFinishDownloadCommand adds socket to
+	EventPoll object while base class AbstractCommand does that
+	already.
+	* src/FtpFinishDownloadCommand.cc
+	* src/FtpFinishDownloadCommand.h
+
 2010-03-21  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Defined gid_t as int64_t.
diff --git a/src/FtpFinishDownloadCommand.cc b/src/FtpFinishDownloadCommand.cc
index d4beb6c8..dfc856f3 100644
--- a/src/FtpFinishDownloadCommand.cc
+++ b/src/FtpFinishDownloadCommand.cc
@@ -61,14 +61,7 @@ FtpFinishDownloadCommand::FtpFinishDownloadCommand
  const SharedHandle<SocketCore>& socket)
   :AbstractCommand(cuid, req, fileEntry, requestGroup, e, socket),
    _ftpConnection(ftpConnection)
-{
-  e->addSocketForReadCheck(socket, this);
-}
-
-FtpFinishDownloadCommand::~FtpFinishDownloadCommand()
-{
-  e->deleteSocketForReadCheck(socket, this);
-}
+{}
 
 // overrides AbstractCommand::execute().
 // AbstractCommand::_segments is empty.
diff --git a/src/FtpFinishDownloadCommand.h b/src/FtpFinishDownloadCommand.h
index 81c02e26..2b75875b 100644
--- a/src/FtpFinishDownloadCommand.h
+++ b/src/FtpFinishDownloadCommand.h
@@ -56,8 +56,6 @@ public:
                            const SharedHandle<FtpConnection>& ftpConnection,
                            DownloadEngine* e,
                            const SharedHandle<SocketCore>& socket);
-
-  virtual ~FtpFinishDownloadCommand();
 };
 
 } // namespace aria2