@@ -560,16 +560,16 @@
 	return statusCode;
 }
 
 - (OFDictionary*)headers
 {
-	return [[headers copy] autorelease];
+	OF_GETTER(headers, YES)
 }
 
 - (OFDataArray*)data
 {
-	return [[data retain] autorelease];
+	OF_GETTER(data, YES)
 }
 @end
 
 @implementation OFObject (OFHTTPRequestDelegate)
 -   (void)request: (OFHTTPRequest*)request