diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml
index b2b7482254dd5f964b784ac433e841f665010ab0..b2262f3743856c4aa290dfcb5c394b2f74511fc5 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml
@@ -68,14 +68,17 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>request=context.REQUEST\n
+            <value> <string>request = container.REQUEST\n
+response = request.RESPONSE\n
+\n
 if hasattr(context,\'getContentType\'):\n
-  request.RESPONSE.setHeader(\'Content-type\', context.getContentType())\n
+  response.setHeader(\'Content-type\', context.getContentType())\n
 else:\n
-  request.RESPONSE.setHeader(\'Content-type\', context.getFormat())\n
-file_name = context.getTitle() or context.getSourceReference()\n
-request.RESPONSE.setHeader(\'Content-disposition\', \'attachment;; filename="%s"\' % file_name)\n
-return context.manage_FTPget()\n
+  response.RESPONSE.setHeader(\'Content-type\', context.getFormat())\n
+\n
+file_name = context.getTitle() or context.getSourceReference() or context.getId()\n
+response.setHeader(\'Content-disposition\', \'attachment;; filename="%s"\' % file_name)\n
+return context.index_html(request, response)\n
 </string> </value>
         </item>
         <item>
@@ -119,9 +122,11 @@ return context.manage_FTPget()\n
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-                            <string>context</string>
+                            <string>container</string>
                             <string>request</string>
+                            <string>response</string>
                             <string>hasattr</string>
+                            <string>context</string>
                             <string>file_name</string>
                           </tuple>
                         </value>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 2415c065944e9ce572ac4d79cc79e621e9dee039..1f704ce60d70b1e318447b4e22ecbe575e4f5cb3 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-448
\ No newline at end of file
+449
\ No newline at end of file