@@ -593,11 +593,11 @@
 		length = strlen(types);
 
 		if (length == 0)
 			@throw [OFInvalidFormatException exception];
 
-		_types = of_alloc(length + 1, 1);
+		_types = OFAllocMemory(length + 1, 1);
 		memcpy(_types, types, length);
 
 		_typesPointers = [[OFMutableData alloc]
 		    initWithItemSize: sizeof(char *)];
 		_offsets = [[OFMutableData alloc]
@@ -667,11 +667,11 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	free(_types);
+	OFFreeMemory(_types);
 	[_typesPointers release];
 	[_offsets release];
 
 	[super dealloc];
 }