diff --git a/nise-frontend/src/corelib/service/download-files.service.ts b/nise-frontend/src/corelib/service/download-files.service.ts
index 9134609..5ee2f95 100644
--- a/nise-frontend/src/corelib/service/download-files.service.ts
+++ b/nise-frontend/src/corelib/service/download-files.service.ts
@@ -18,12 +18,16 @@ export class DownloadFilesService {
   }
 
   downloadCSV(input: Object[], columns: string[], fileName: string = 'data') {
-    const header = columns.join(',') + '\n';
+    let csvData = columns.join(',') + '\n';
 
-    let csvData = input.map(row =>
-      input.map(row => Object.values(row).join(',')).join('\n')
-    ).join('\n');
-    csvData = header + csvData;
+    for (const row of input) {
+      let rowData: string[] = [];
+      for (const column of columns) {
+        rowData.push((row as Record<string, string>)[column]);
+      }
+
+      csvData += rowData.join(',') + '\n';
+    }
 
     const blob = new Blob([csvData], { type: 'text/csv' });
     const url = window.URL.createObjectURL(blob);