@@ -224,12 +224,13 @@
 }
 
 - (OFEnumerator*)objectEnumerator
 {
 	return [[[OFArrayEnumerator alloc]
-	    initWithDataArray: array
-	     mutationsPointer: &mutations] autorelease];
+	       initWithArray: self
+		   dataArray: array
+	    mutationsPointer: &mutations] autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
 {
@@ -240,11 +241,12 @@
 	unsigned long mutations2 = mutations;
 
 	for (i = 0; i < count && !stop; i++) {
 		if (mutations != mutations2)
 			@throw [OFEnumerationMutationException
-			    newWithClass: isa];
+			    newWithClass: isa
+				  object: self];
 
 		block(objs[i], i, &stop);
 		[pool releaseObjects];
 	}
 
@@ -260,11 +262,12 @@
 	unsigned long mutations2 = mutations;
 
 	for (i = 0; i < count && !stop; i++) {
 		if (mutations != mutations2)
 			@throw [OFEnumerationMutationException
-			    newWithClass: isa];
+			    newWithClass: isa
+				  object: self];
 
 		id new = block(objs[i], i, &stop);
 
 		if (new == nil)
 			@throw [OFInvalidArgumentException newWithClass: isa