diff --git a/AppKit/CPArrayController.j b/AppKit/CPArrayController.j
index 4953c3016..3e3dd1778 100644
--- a/AppKit/CPArrayController.j
+++ b/AppKit/CPArrayController.j
@@ -197,14 +197,21 @@
 
 - (CPArray)arrangeObjects:(CPArray)objects
 {
-    var sortedObjects = objects;
+    var filterPredicate = [self filterPredicate],
+        sortDescriptors = [self sortDescriptors];
 
-    if ([self filterPredicate])
-        sortedObjects = [sortedObjects filteredArrayUsingPredicate:[self filterPredicate]];
-    if ([self sortDescriptors])
-        sortedObjects = [sortedObjects sortedArrayUsingDescriptors:[self sortDescriptors]];
+    if (filterPredicate && sortDescriptors)
+    {
+        var sortedObjects = [objects filteredArrayUsingPredicate:filterPredicate];
+        [sortedObjects sortUsingDescriptors:sortDescriptors];
+        return sortedObjects;
+    }
+    else if (filterPredicate)
+        return [objects filteredArrayUsingPredicate:filterPredicate];
+    else if (sortDescriptors)
+        return [objects sortedArrayUsingDescriptors:sortDescriptors];
 
-    return sortedObjects;
+    return [objects copy];
 }
 
 - (void)rearrangeObjects
diff --git a/Foundation/CPPredicate/CPPredicate.j b/Foundation/CPPredicate/CPPredicate.j
index bd992b978..18a0c5b51 100644
--- a/Foundation/CPPredicate/CPPredicate.j
+++ b/Foundation/CPPredicate/CPPredicate.j
@@ -168,10 +168,9 @@
 
     for (i = 0; i < count; i++)
     {
-        var object = [self objectAtIndex:i];
-
+        var object = self[i];
         if ([predicate evaluateWithObject:object])
-            [result addObject:object];
+            result.push(object);
     }
 
     return result;
@@ -183,10 +182,8 @@
 
     while (count--)
     {
-        var object = [self objectAtIndex:count];
-
-        if (![predicate evaluateWithObject:object])
-            [self removeObjectAtIndex:count];
+        if (![predicate evaluateWithObject:self[count]])
+            splice(count, 1);
     }
 }
 
diff --git a/Tests/AppKit/CPArrayControllerPerformance.j b/Tests/AppKit/CPArrayControllerPerformance.j
index fef9c9c4a..083f9b343 100644
--- a/Tests/AppKit/CPArrayControllerPerformance.j
+++ b/Tests/AppKit/CPArrayControllerPerformance.j
@@ -7,11 +7,12 @@
 - (void)testRearrangeObjects
 {
     var ELEMENTS = 200,
-        REPEATS = 50,
+        REPEATS = 25,
         ac = [CPArrayController new],
         array = [];
 
-    for (var i=0; i<ELEMENTS; i++) {
+    for (var i = 0; i < ELEMENTS; i++)
+    {
         var s = [Sortable new];
         [s setA:i];
         [s setB:i % 3];
@@ -24,12 +25,12 @@
 
     [ac setContent:array];
 
+
+    [ac setFilterPredicate:[CPPredicate predicateWithFormat:@"(b != %@)", 0]];
+
+    // Filter alone
     var start = (new Date).getTime();
-
-    [ac setSortDescriptors:descriptors];
-    [ac setFilterPredicate:[CPPredicate predicateWithFormat:@"(b !=%@)", 0]];
-
-    for (var i=0; i<REPEATS; i++)
+    for (var i = 0; i < REPEATS; i++)
     {
         [ac rearrangeObjects];
 
@@ -37,7 +38,30 @@
             last = ELEMENTS;
 
         // Verify that all is well.
-        for (var j=0, count=[sorted count]; j<count; j++)
+        for (var j = 0, count = [sorted count]; j < count; j++)
+        {
+            if (sorted[j].b == 0)
+                [self fail:"b == 0 should be filtered out (position: "+j+")"];
+            last = sorted[j];
+        }
+    }
+    var end = (new Date).getTime();
+
+    CPLog.warn("testRearrangeObjects, filter: "+(end-start)+"ms");
+
+    [ac setSortDescriptors:descriptors];
+
+    // Filter and sort.
+    start = (new Date).getTime();
+    for (var i = 0; i < REPEATS; i++)
+    {
+        [ac rearrangeObjects];
+
+        var sorted = [ac arrangedObjects],
+            last = ELEMENTS;
+
+        // Verify that all is well.
+        for (var j = 0, count = [sorted count]; j < count; j++)
         {
             if (sorted[j].b == 0)
                 [self fail:"b == 0 should be filtered out (position: "+j+")"];
@@ -46,11 +70,9 @@
             last = sorted[j];
         }
     }
+    end = (new Date).getTime();
 
-
-    var end = (new Date).getTime();
-
-    CPLog.warn("testRearrangeObjects: "+(end-start)+"ms");
+    CPLog.warn("testRearrangeObjects, filter and sort: "+(end-start)+"ms");
 }
 
 @end