@@ -46,11 +46,11 @@
 		OFXMLElement *child;
 
 		if (![[element name] isEqual: [self className]] ||
 		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
 			@throw [OFInvalidArgumentException
-			    exceptionWithClass: isa
+			    exceptionWithClass: [self class]
 				      selector: _cmd];
 
 		enumerator = [[element elementsForNamespace:
 		    OF_SERIALIZATION_NS] objectEnumerator];
 		pool2 = [[OFAutoreleasePool alloc] init];
@@ -270,11 +270,11 @@
 	return NO;
 }
 
 - copy
 {
-	OFList *copy = [[isa alloc] init];
+	OFList *copy = [[[self class] alloc] init];
 	of_list_object_t *iter, *listObject, *previous;
 
 	listObject = NULL;
 	previous = NULL;
 
@@ -441,11 +441,11 @@
 {
 	id ret;
 
 	if (*mutationsPtr != mutations)
 		@throw [OFEnumerationMutationException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 				object: list];
 
 	if (current == NULL)
 		return nil;
 
@@ -457,11 +457,11 @@
 
 - (void)reset
 {
 	if (*mutationsPtr != mutations)
 		@throw [OFEnumerationMutationException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 				object: list];
 
 	current = [list firstListObject];
 }
 @end