diff --git a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
index c775143cd..68374f2ff 100644
--- a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
+++ b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
@@ -1309,12 +1309,14 @@ int SoapySDROutput::webapiSettingsPutPatch(
     {
         QList<SWGSDRangel::SWGArgValue*> *tunableElements = response.getSoapySdrOutputSettings()->getTunableElements();
 
-        for (const auto itArg : *tunableElements)
+        for (const auto &itArg : *tunableElements)
         {
-            auto ovalue = settings.m_tunableElements.find(*itArg->getKey());
+            QMap<QString, double>::iterator itSettings = settings.m_tunableElements.find(*(itArg->getKey()));
 
-            if ((ovalue != settings.m_tunableElements.end()) && (atof(itArg->getValueString()->toStdString().c_str()) != *ovalue)) {
-                m_settings.m_tunableElements[*itArg->getKey()] = atof(itArg->getValueString()->toStdString().c_str());
+            if (itSettings != settings.m_tunableElements.end())
+            {
+                QVariant v = webapiVariantFromArgValue(itArg);
+                itSettings.value() = v.toDouble();
             }
         }
     }
@@ -1327,12 +1329,14 @@ int SoapySDROutput::webapiSettingsPutPatch(
     {
         QList<SWGSDRangel::SWGArgValue*> *individualGains = response.getSoapySdrOutputSettings()->getIndividualGains();
 
-        for (const auto itArg : *individualGains)
+        for (const auto &itArg : *individualGains)
         {
-            auto ovalue = settings.m_individualGains.find(*itArg->getKey());
+            QMap<QString, double>::iterator itSettings = settings.m_individualGains.find(*(itArg->getKey()));
 
-            if ((ovalue != settings.m_individualGains.end()) && (atof(itArg->getValueString()->toStdString().c_str()) != *ovalue)) {
-                m_settings.m_individualGains[*itArg->getKey()] = atof(itArg->getValueString()->toStdString().c_str());
+            if (itSettings != settings.m_individualGains.end())
+            {
+                QVariant v = webapiVariantFromArgValue(itArg);
+                itSettings.value() = v.toDouble();
             }
         }
     }
diff --git a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
index 8bdbc2b36..b516f9eb6 100644
--- a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
+++ b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
@@ -1373,12 +1373,14 @@ int SoapySDRInput::webapiSettingsPutPatch(
     {
         QList<SWGSDRangel::SWGArgValue*> *tunableElements = response.getSoapySdrInputSettings()->getTunableElements();
 
-        for (const auto itArg : *tunableElements)
+        for (const auto &itArg : *tunableElements)
         {
-            auto ovalue = settings.m_tunableElements.find(*itArg->getKey());
+            QMap<QString, double>::iterator itSettings = settings.m_tunableElements.find(*(itArg->getKey()));
 
-            if ((ovalue != settings.m_tunableElements.end()) && (atof(itArg->getValueString()->toStdString().c_str()) != *ovalue)) {
-                m_settings.m_tunableElements[*itArg->getKey()] = atof(itArg->getValueString()->toStdString().c_str());
+            if (itSettings != settings.m_tunableElements.end())
+            {
+                QVariant v = webapiVariantFromArgValue(itArg);
+                itSettings.value() = v.toDouble();
             }
         }
     }
@@ -1391,12 +1393,14 @@ int SoapySDRInput::webapiSettingsPutPatch(
     {
         QList<SWGSDRangel::SWGArgValue*> *individualGains = response.getSoapySdrInputSettings()->getIndividualGains();
 
-        for (const auto itArg : *individualGains)
+        for (const auto &itArg : *individualGains)
         {
-            auto ovalue = settings.m_individualGains.find(*itArg->getKey());
+            QMap<QString, double>::iterator itSettings = settings.m_individualGains.find(*(itArg->getKey()));
 
-            if ((ovalue != settings.m_individualGains.end()) && (atof(itArg->getValueString()->toStdString().c_str()) != *ovalue)) {
-                m_settings.m_individualGains[*itArg->getKey()] = atof(itArg->getValueString()->toStdString().c_str());
+            if (itSettings != settings.m_individualGains.end())
+            {
+                QVariant v = webapiVariantFromArgValue(itArg);
+                itSettings.value() = v.toDouble();
             }
         }
     }