@@ -21,12 +21,12 @@
 #import "OFNotImplementedException.h"
 
 @implementation OFEnumerator
 - init
 {
-	if (isa == [OFEnumerator class]) {
-		Class c = isa;
+	if (object_getClass(self) == [OFEnumerator class]) {
+		Class c = [self class];
 		[self release];
 		@throw [OFNotImplementedException exceptionWithClass: c
 							    selector: _cmd];
 	}
 
@@ -33,15 +33,15 @@
 	return [super init];
 }
 
 - (id)nextObject
 {
-	@throw [OFNotImplementedException exceptionWithClass: isa
+	@throw [OFNotImplementedException exceptionWithClass: [self class]
 						    selector: _cmd];
 }
 
 - (void)reset
 {
-	@throw [OFNotImplementedException exceptionWithClass: isa
+	@throw [OFNotImplementedException exceptionWithClass: [self class]
 						    selector: _cmd];
 }
 @end