@@ -125,24 +125,24 @@
 			case 1:
 				is_utf8 = YES;
 				break;
 			case -1:
 				c = isa;
-				[super free];
+				[super dealloc];
 				@throw [OFInvalidEncodingException
 					newWithClass: c];
 		}
 
 		@try {
 			string = [self allocWithSize: length + 1];
 		} @catch (OFException *e) {
 			/*
-			 * We can't use [super free] on OS X here. Compiler bug?
-			 * [self free] will do here as we don't reimplement
-			 * free.
+			 * We can't use [super dealloc] on OS X here.
+			 * Compiler bug? Anyway, [self dealloc] will do here as
+			 * we don't reimplement dealloc.
 			 */
-			[self free];
+			[self dealloc];
 			@throw e;
 		}
 		memcpy(string, str, length + 1);
 	}
 
@@ -170,17 +170,17 @@
 
 	self = [super init];
 
 	if (fmt == NULL) {
 		c = isa;
-		[super free];
+		[super dealloc];
 		@throw [OFInvalidFormatException newWithClass: c];
 	}
 
 	if ((t = vasprintf(&string, fmt, args)) == -1) {
 		c = isa;
-		[super free];
+		[super dealloc];
 		@throw [OFInitializationFailedException newWithClass: c];
 	}
 	length = t;
 
 	switch (check_utf8(string, length)) {
@@ -188,11 +188,11 @@
 			is_utf8 = YES;
 			break;
 		case -1:
 			free(string);
 			c = isa;
-			[super free];
+			[super dealloc];
 			@throw [OFInvalidEncodingException newWithClass: c];
 	}
 
 	@try {
 		[self addToMemoryPool: string];