@@ -105,12 +105,10 @@
 	for (size_t i = 0; i < count; i++) {
 		if ([objects[i] isEqual: oldObject]) {
 			[newObject retain];
 			[objects[i] release];
 			objects[i] = newObject;
-
-			return;
 		}
 	}
 }
 
 - (void)replaceObjectAtIndex: (size_t)idx withObject: (id)object
@@ -171,11 +169,14 @@
 			[_array removeItemAtIndex: i];
 			_mutations++;
 
 			[object release];
 
-			return;
+			objects = _array.items;
+			i--;
+			count--;
+			continue;
 		}
 	}
 }
 
 - (void)removeObjectIdenticalTo: (id)object
@@ -194,11 +195,14 @@
 			[_array removeItemAtIndex: i];
 			_mutations++;
 
 			[object release];
 
-			return;
+			objects = _array.items;
+			i--;
+			count--;
+			continue;
 		}
 	}
 }
 
 - (void)removeObjectAtIndex: (size_t)idx