diff --git a/CHANGES.txt b/CHANGES.txt
index 7add3fe..3366777 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@
 ALL CHANGES
   TEZ-1631. Session dag submission timeout can result in duplicate DAG
   submissions
+  TEZ-2470. IllegalStateException in ShuffleManager.constructFetcherForHost in tez-0.4.x
 
 Release 0.4.1-incubating: 2014-06-30
 
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java
index 050c0c0..1028203 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/shuffle/common/impl/ShuffleManager.java
@@ -316,6 +316,7 @@
       // Avoid adding attempts which have already completed.
       if (completedInputSet.contains(input.getInputIdentifier())) {
         inputIter.remove();
+        continue;
       }
       // Avoid adding attempts which have been marked as OBSOLETE 
       if (obsoletedInputs.contains(input)) {