diff --git a/Cpp/lib/waveform.cpp b/Cpp/lib/waveform.cpp
index 950fe1f25926380ddc70b0ba8966599f89413517..57332ce29b3563fb7d12b74c65a3a157ee7dd18d 100644
--- a/Cpp/lib/waveform.cpp
+++ b/Cpp/lib/waveform.cpp
@@ -107,15 +107,15 @@ void ArrayWaveform::saveParam(std::string fileName) {
     );
     std::ofstream saveFile(fileName);
     if (saveFile.is_open()) {
-        saveFile << "samplingRate," << this->wfmParam.samplingRate << "\n";
-        saveFile << "freqResolution," << this->wfmParam.freqResolution << "\n";
-        saveFile << "freqTones,"
+        saveFile << this->wfmParam.samplingRate << "\n";
+        saveFile << this->wfmParam.freqResolution << "\n";
+        saveFile
             << this->wfmParam.freqTones.format(csvFormat)
             << "\n";
-        saveFile << "phases,"
+        saveFile
             << this->wfmParam.phases.format(csvFormat)
             << "\n";
-        saveFile << "amplitudes,"
+        saveFile
             << this->wfmParam.amplitudes.format(csvFormat)
             << "\n";
         saveFile.close();
@@ -142,19 +142,19 @@ void ArrayWaveform::loadParam(std::string fileName) {
             this->wfmParam.freqResolution = std::stoi(std::string(line[0]));
             break;
         case 2:
-            for (auto i = 0; i < line.size() - 1; i++) {
+            for (auto i = 0; i < line.size(); i++) {
                 lineDataI.push_back(std::stoi(std::string(line[i])));
             }
             setFreqTone(lineDataI);
             break;
         case 3:
-            for (auto i = 0; i < line.size() - 1; i++) {
+            for (auto i = 0; i < line.size(); i++) {
                 lineDataD.push_back(std::stod(std::string(line[i])));
             }
             setPhase(lineDataD);
             break;
         case 4:
-            for (auto i = 0; i < line.size() - 1; i++) {
+            for (auto i = 0; i < line.size(); i++) {
                 lineDataD.push_back(std::stod(std::string(line[i])));
             }
             setAmplitude(lineDataD);