diff --git a/src/DataSet/DataSet.cpp b/src/DataSet/DataSet.cpp
index f81374e893ad9ea252478e39938044f6c8c19e92..2457abbf369281ee4405ff59a7e6c7c474880a41 100644
--- a/src/DataSet/DataSet.cpp
+++ b/src/DataSet/DataSet.cpp
@@ -239,15 +239,15 @@ namespace lib4neuro {
         for (auto e : this->data) {
             /* First part of the pair */
             for (unsigned int i = 0; i < e.first.size() - 1; i++) {
-                *file_path << e.first.at(i) << ",";
+                *file_path << this->get_denormalized_value(e.first.at(i)) << ",";
             }
-            *file_path << e.first.back() << " ";
+            *file_path << this->get_denormalized_value(e.first.back()) << " ";
 
             /* Second part of the pair */
             for (unsigned int i = 0; i < e.second.size() - 1; i++) {
-                *file_path << e.second.at(i) << ",";
+                *file_path << this->get_denormalized_value(e.second.at(i)) << ",";
             }
-            *file_path << e.second.back() << std::endl;
+            *file_path << this->get_denormalized_value(e.second.back()) << std::endl;
         }
     }
 
@@ -257,19 +257,8 @@ namespace lib4neuro {
         if (!ofs.is_open()) {
             THROW_RUNTIME_ERROR("File " + file_path + " couldn't be open!");
         } else {
-            for (auto e : this->data) {
-                /* First part of the pair */
-                for (unsigned int i = 0; i < e.first.size() - 1; i++) {
-                    ofs << e.first.at(i) << ",";
-                }
-                ofs << e.first.back() << " ";
-
-                /* Second part of the pair */
-                for (unsigned int i = 0; i < e.second.size() - 1; i++) {
-                    ofs << e.second.at(i) << ",";
-                }
-                ofs << e.second.back() << std::endl;
-            }
+            this->store_data_text( &ofs );
+            ofs.close();
         }
     }