--- jsr166/src/jsr166e/ConcurrentHashMapV8.java	2012/08/13 18:49:36	1.56
+++ jsr166/src/jsr166e/ConcurrentHashMapV8.java	2012/08/13 19:52:33	1.57
@@ -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)