@@ -245,17 +245,13 @@
 	if (oldObject == nil || newObject == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	count = self.count;
 
-	for (size_t i = 0; i < count; i++) {
-		if ([self objectAtIndex: i] == oldObject) {
+	for (size_t i = 0; i < count; i++)
+		if ([self objectAtIndex: i] == oldObject)
 			[self replaceObjectAtIndex: i withObject: newObject];
-
-			return;
-		}
-	}
 }
 
 - (void)removeObjectAtIndex: (size_t)idx
 {
 	OF_UNRECOGNIZED_SELECTOR