diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 12bef797f..3e6e7d1e3 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1155,6 +1155,7 @@ class AdminControllerCore extends Controller
         header('Cache-Control: no-store, no-cache');
         header('Content-disposition: attachment; filename="'.$this->table.'_'.date('Y-m-d_His').'.csv"');
 
+        $fd = fopen('php://output', 'wb');
         $headers = array();
         foreach ($this->fields_list as $key => $datas) {
             if ('PDF' === $datas['title']) {
@@ -1167,9 +1168,10 @@ class AdminControllerCore extends Controller
                 }
             }
         }
-        $content = array();
+
+        fputcsv($fd, $headers, ';', $text_delimiter);
         foreach ($this->_list as $i => $row) {
-            $content[$i] = array();
+            $content = array();
             $path_to_image = false;
             foreach ($this->fields_list as $key => $params) {
                 $field_value = isset($row[$key]) ? Tools::htmlentitiesDecodeUTF8(Tools::nl2br($row[$key])) : '';
@@ -1189,21 +1191,16 @@ class AdminControllerCore extends Controller
                         $field_value = call_user_func_array(array($callback_obj, $params['callback']), array($field_value, $row));
                     }
                 }
-                $content[$i][] = $field_value;
+                $content[] = $field_value;
             }
+            fputcsv($fd, $content, ';', $text_delimiter);
         }
 
-        $this->context->smarty->assign(array(
-            'export_precontent' => "",
-            'export_headers' => $headers,
-            'export_content' => $content,
-            'text_delimiter' => $text_delimiter
-            )
-        );
-
-        $this->layout = 'layout-export.tpl';
+        @fclose($fd);
+        die;
     }
 
+
     /**
      * Object Delete
      *