diff --git a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
index 2989112..a52a85a 100644
--- a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
+++ b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
@@ -819,7 +819,7 @@ void SpectrumAnalyzer::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number(settings.f_stop - settings.f_start);
+        return QString::number(settings.f_stop - settings.f_start, 'f', 0);
     }));
     scpi_freq->add(new SCPICommand("START", [=](QStringList params) -> QString {
         unsigned long long newval;
@@ -830,7 +830,7 @@ void SpectrumAnalyzer::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number(settings.f_start);
+        return QString::number(settings.f_start, 'f', 0);
     }));
     scpi_freq->add(new SCPICommand("CENTer", [=](QStringList params) -> QString {
         unsigned long long newval;
@@ -841,7 +841,7 @@ void SpectrumAnalyzer::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number((settings.f_start + settings.f_stop)/2);
+        return QString::number((settings.f_start + settings.f_stop)/2, 'f', 0);
     }));
     scpi_freq->add(new SCPICommand("STOP", [=](QStringList params) -> QString {
         unsigned long long newval;
@@ -852,7 +852,7 @@ void SpectrumAnalyzer::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number(settings.f_stop);
+        return QString::number(settings.f_stop, 'f', 0);
     }));
     scpi_freq->add(new SCPICommand("FULL", [=](QStringList params) -> QString {
         Q_UNUSED(params)
diff --git a/Software/PC_Application/Traces/tracewidget.cpp b/Software/PC_Application/Traces/tracewidget.cpp
index f29ee6d..275ee32 100644
--- a/Software/PC_Application/Traces/tracewidget.cpp
+++ b/Software/PC_Application/Traces/tracewidget.cpp
@@ -209,7 +209,7 @@ void TraceWidget::SetupSCPI()
         QString ret;
         for(unsigned int i=0;i<t->size();i++) {
             auto d = t->sample(i);
-            ret += "["+QString::number(d.x)+","+createStringFromData(t, d)+"],";
+            ret += "["+QString::number(d.x, 'f', 0)+","+createStringFromData(t, d)+"],";
         }
         ret.chop(1);
         return ret;
@@ -293,14 +293,14 @@ void TraceWidget::SetupSCPI()
         if(!t) {
            return "ERROR";
         }
-        return QString::number(t->maxX());
+        return QString::number(t->maxX(), 'f', 0);
     }));
     add(new SCPICommand("MINFrequency", nullptr, [=](QStringList params) -> QString {
         auto t = findTrace(params);
         if(!t) {
            return "ERROR";
         }
-        return QString::number(t->minX());
+        return QString::number(t->minX(), 'f', 0);
     }));
     add(new SCPICommand("MAXAmplitude", nullptr, [=](QStringList params) -> QString {
         auto t = findTrace(params);
@@ -308,7 +308,7 @@ void TraceWidget::SetupSCPI()
            return "ERROR";
         }
         auto d = t->interpolatedSample(t->findExtremum(true));
-        return QString::number(d.x)+","+createStringFromData(t, d);
+        return QString::number(d.x, 'f', 0)+","+createStringFromData(t, d);
     }));
     add(new SCPICommand("MINAmplitude", nullptr, [=](QStringList params) -> QString {
         auto t = findTrace(params);
@@ -316,7 +316,7 @@ void TraceWidget::SetupSCPI()
            return "ERROR";
         }
         auto d = t->interpolatedSample(t->findExtremum(false));
-        return QString::number(d.x)+","+createStringFromData(t, d);
+        return QString::number(d.x, 'f', 0)+","+createStringFromData(t, d);
     }));
     add(new SCPICommand("NEW", [=](QStringList params) -> QString {
         if(params.size() != 1) {
diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp
index 2b33487..e0ded1b 100644
--- a/Software/PC_Application/VNA/vna.cpp
+++ b/Software/PC_Application/VNA/vna.cpp
@@ -1287,7 +1287,7 @@ void VNA::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number(settings.Freq.stop - settings.Freq.start);
+        return QString::number(settings.Freq.stop - settings.Freq.start, 'f', 0);
     }));
     scpi_freq->add(new SCPICommand("START", [=](QStringList params) -> QString {
         unsigned long long newval;
@@ -1298,7 +1298,7 @@ void VNA::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number(settings.Freq.start);
+        return QString::number(settings.Freq.start, 'f', 0);
     }));
     scpi_freq->add(new SCPICommand("CENTer", [=](QStringList params) -> QString {
         unsigned long long newval;
@@ -1309,7 +1309,7 @@ void VNA::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number((settings.Freq.start + settings.Freq.stop)/2);
+        return QString::number((settings.Freq.start + settings.Freq.stop)/2, 'f', 0);
     }));
     scpi_freq->add(new SCPICommand("STOP", [=](QStringList params) -> QString {
         unsigned long long newval;
@@ -1320,7 +1320,7 @@ void VNA::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number(settings.Freq.stop);
+        return QString::number(settings.Freq.stop, 'f', 0);
     }));
     scpi_freq->add(new SCPICommand("FULL", [=](QStringList params) -> QString {
         Q_UNUSED(params)
@@ -1428,7 +1428,7 @@ void VNA::SetupSCPI()
             return "";
         }
     }, [=](QStringList) -> QString {
-        return QString::number(settings.Power.frequency);
+        return QString::number(settings.Power.frequency, 'f', 0);
     }));
     SCPINode::add(traceWidget);
     auto scpi_cal = new SCPINode("CALibration");