--- jsr166/src/jsr166e/ConcurrentHashMapV8.java	2012/08/13 18:49:36	1.56
+++ jsr166/src/jsr166e/ConcurrentHashMapV8.java	2012/08/14 05:55:08	1.58
@@ -2327,7 +2327,7 @@ public class ConcurrentHashMapV8<K, V>
         }
 
         public final void remove() {
-            if (nextVal == null)
+            if (nextVal == null && last == null)
                 advance();
             Node e = last;
             if (e == null)
@@ -4374,6 +4374,7 @@ public class ConcurrentHashMapV8<K, V>
             return new ReduceKeysTask<K,V>
                 (map, reducer);
         }
+
         /**
          * Returns a task that when invoked, returns the result of
          * accumulating the given transformation of all keys using the given