@@ -139,11 +139,11 @@
 		va_start(args, data);
 
 		while ((arg = va_arg(args, char*)) != NULL &&
 		    (val = va_arg(args, char*)) != NULL) {
 			esc_val = NULL;	/* Needed for our @catch */
-			esc_val = [OFXMLFactory escapeCString: val];
+			esc_val = [self escapeCString: val];
 
 			xf_resize_chars(&xml, &len, 1 + strlen(arg) + 2 +
 			    strlen(esc_val) + 1, self);
 
 			xml[i++] = ' ';