diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
index 1f79d4001a..69c0c06196 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
@@ -208,10 +208,12 @@ public class PAPBinTable
             final int startInclusive = lastParStart;
             final int endExclusive = charIndex + 1;
 
+            boolean broken = false;
             List<PAPX> papxs = new LinkedList<PAPX>();
             for ( int papxIndex = lastPapxIndex; papxIndex < oldPapxSortedByEndPos
                     .size(); papxIndex++ )
             {
+                broken = false;
                 PAPX papx = oldPapxSortedByEndPos.get( papxIndex );
 
                 assert startInclusive == 0
@@ -221,11 +223,16 @@ public class PAPBinTable
                 if ( papx.getEnd() - 1 > charIndex )
                 {
                     lastPapxIndex = papxIndex;
+                    broken = true;
                     break;
                 }
 
                 papxs.add( papx );
             }
+            if ( !broken )
+            {
+                lastPapxIndex = oldPapxSortedByEndPos.size() - 1;
+            }
 
             if ( papxs.size() == 0 )
             {