--- a/OrderedCollection.st	Sat Sep 14 13:37:53 2002 +0200
+++ b/OrderedCollection.st	Sat Sep 14 13:40:59 2002 +0200
@@ -881,12 +881,22 @@
     index := contentsArray identityIndexOf:anObject startingAt:firstIndex endingAt:lastIndex.
     index ~~ 0 ifTrue:[
         index == firstIndex ifTrue:[
-            contentsArray at:firstIndex put:nil.
+            contentsArray basicAt:firstIndex put:nil.
             firstIndex := firstIndex + 1.
+            firstIndex > lastIndex ifTrue:[
+                "reset to avoid ever growing"
+                firstIndex := 1.
+                lastIndex := 0 
+            ].
         ] ifFalse:[
             index == lastIndex ifTrue:[
-                contentsArray at:lastIndex put:nil.
+                contentsArray basicAt:lastIndex put:nil.
                 lastIndex := lastIndex - 1.
+                firstIndex > lastIndex ifTrue:[
+                    "reset to avoid ever growing"
+                    firstIndex := 1.
+                    lastIndex := 0 
+                ].
             ] ifFalse:[
                 index := index - firstIndex + 1.
                 self removeFromIndex:index toIndex:index.
@@ -1850,5 +1860,5 @@
 !OrderedCollection class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/OrderedCollection.st,v 1.81 2002-09-14 11:37:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/OrderedCollection.st,v 1.82 2002-09-14 11:40:59 cg Exp $'
 ! !