diff --git a/Headers/Foundation/NSArray.h b/Headers/Foundation/NSArray.h
index bb055eb9c..6e096a8a7 100644
--- a/Headers/Foundation/NSArray.h
+++ b/Headers/Foundation/NSArray.h
@@ -283,7 +283,7 @@ DEFINE_BLOCK_TYPE(GSPredicateBlock, BOOL, GS_GENERIC_TYPE(ElementT),
 - (GS_GENERIC_CLASS(NSArray, ElementT) *)
     sortedArrayWithOptions: (NSSortOptions)options
            usingComparator: (NSComparator)comparator;
-  
+
 /**
  * Performs a binary search of the array within the specified range for the
  * index of an object equal to obj according to cmp.
diff --git a/Source/GSOrderedSet.m b/Source/GSOrderedSet.m
index 3b6c3cb94..62517d948 100644
--- a/Source/GSOrderedSet.m
+++ b/Source/GSOrderedSet.m
@@ -315,8 +315,8 @@ static Class	mutableSetClass;
 - (void) replaceObjectAtIndex: (NSUInteger)index
 		   withObject: (id)obj
 {
-  [self _insertObject: obj atIndex: index];
   [self removeObjectAtIndex: index];
+  [self _insertObject: obj atIndex: index];
 }
 
 - (id) init