diff --git a/ChangeLog b/ChangeLog
index 4999e639..f572a424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Fixed: numCommand is less than the value specified in -C option.
+	* src/RequestGroup.cc
+
 2008-08-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Fixed occasional assertion failure in PieceSegment.
diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc
index f4e7b078..ddde492d 100644
--- a/src/RequestGroup.cc
+++ b/src/RequestGroup.cc
@@ -486,12 +486,13 @@ void RequestGroup::createNextCommandWithAdj(std::deque<Command*>& commands,
     numCommand = 1+numAdj;
   } else {
     if(_numConcurrentCommand == 0) {
-      numCommand = std::min(_downloadContext->getNumPieces(), _uris.size());
+      numCommand = _uris.size();
     } else {
-      numCommand = std::min(_downloadContext->getNumPieces(),
-			    _numConcurrentCommand);
+      numCommand = _numConcurrentCommand;
     }
     numCommand += numAdj;
+    numCommand = std::min(static_cast<int>(_downloadContext->getNumPieces()),
+			  numCommand);
   }
   if(numCommand > 0) {
     createNextCommand(commands, e, numCommand);