Index: src/java/org/apache/poi/hssf/record/EscherAggregate.java
===================================================================
--- src/java/org/apache/poi/hssf/record/EscherAggregate.java	(revision 1727862)
+++ src/java/org/apache/poi/hssf/record/EscherAggregate.java	(working copy)
@@ -438,9 +438,7 @@
         while (loc < records.size()) {
             if (sid(records, loc) == NoteRecord.sid) {
                 NoteRecord r = (NoteRecord) records.get(loc);
-                agg.tailRec.put(r.getShapeId(), r);
-            } else {
-                break;
+                agg.addTailRecord(r);
             }
             loc++;
         }