diff --git a/ports-juce6.0/vitalium/source/common/synth_base.cpp b/ports-juce6.0/vitalium/source/common/synth_base.cpp
index 4314ac87..50eb6617 100644
--- a/ports-juce6.0/vitalium/source/common/synth_base.cpp
+++ b/ports-juce6.0/vitalium/source/common/synth_base.cpp
@@ -340,9 +340,9 @@ void SynthBase::loadTuningFile(const File& file) {
 void SynthBase::loadInitPreset() {
   pauseProcessing(true);
 
-  auto old_values = std::map<std::string, float>();
-  for (auto i = controls_.begin(); i != controls_.end(); i++) {
-    old_values.insert(std::pair<std::string, float>(i->first, i->second->value()));
+  std::map<std::string, float> old_values;
+  for (const auto &i: controls_) {
+    old_values.insert(std::pair<std::string, float>(i.first, i.second->value()));
   }
   
   engine_->allSoundsOff();
@@ -362,9 +362,9 @@ void SynthBase::loadInitPreset() {
 bool SynthBase::loadFromJson(const json& data) {
   pauseProcessing(true);
 
-  auto old_values = std::map<std::string, float>();
-  for (auto i = controls_.begin(); i != controls_.end(); i++) {
-    old_values.insert(std::pair<std::string, float>(i->first, i->second->value()));
+  std::map<std::string, float> old_values;
+  for (const auto &i: controls_) {
+    old_values.insert(std::pair<std::string, float>(i.first, i.second->value()));
   }
 
   engine_->allSoundsOff();