diff --git a/ChangeLog b/ChangeLog
index 6e093f73..70682c61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed the bug that hash check hangs when aria2.pause is issued
+	while aria2 is checking piece hashes.  Fixed the bug that the
+	download is paused after file allocation completion even if
+	aria2.pause is issued during file allocation.
+	* src/CheckIntegrityCommand.cc
+	* src/FileAllocationCommand.cc
+
 2010-04-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added nsl to search-libs for getaddrinfo on opensolaris
diff --git a/src/CheckIntegrityCommand.cc b/src/CheckIntegrityCommand.cc
index b15be8c8..d434a070 100644
--- a/src/CheckIntegrityCommand.cc
+++ b/src/CheckIntegrityCommand.cc
@@ -58,6 +58,7 @@ CheckIntegrityCommand::~CheckIntegrityCommand() {}
 bool CheckIntegrityCommand::executeInternal()
 {
   if(_requestGroup->isHaltRequested()) {
+    _e->_checkIntegrityMan->dropPickedEntry();
     return true;
   }
   _entry->validateChunk();
diff --git a/src/FileAllocationCommand.cc b/src/FileAllocationCommand.cc
index f3ca426a..7046e7cf 100644
--- a/src/FileAllocationCommand.cc
+++ b/src/FileAllocationCommand.cc
@@ -59,7 +59,8 @@ FileAllocationCommand::~FileAllocationCommand() {}
 
 bool FileAllocationCommand::executeInternal()
 {
-  if(_e->isHaltRequested()) {
+  if(_requestGroup->isHaltRequested()) {
+    _e->_fileAllocationMan->dropPickedEntry();
     return true;
   }
   _fileAllocationEntry->allocateChunk();