diff --git a/templates/high_scale_spectrum_generator.hpp.in b/templates/high_scale_spectrum_generator.hpp.in
index 60c835518..d0b5f11bb 100644
--- a/templates/high_scale_spectrum_generator.hpp.in
+++ b/templates/high_scale_spectrum_generator.hpp.in
@@ -46,9 +46,6 @@ class @ModelName@_spectrum_generator
 public:
    @ModelName@_spectrum_generator()
       : @ModelName@_spectrum_generator_interface<T>()
-      , high_scale_constraint()
-      , susy_scale_constraint()
-      , low_scale_constraint()
       , high_scale(0.)
       , susy_scale(0.)
       , low_scale(0.)
@@ -63,9 +60,6 @@ public:
    void write_running_couplings(const std::string& filename = "@ModelName@_rgflow.dat") const;
 
 private:
-   @ModelName@_high_scale_constraint<T> high_scale_constraint;
-   @ModelName@_susy_scale_constraint<T> susy_scale_constraint;
-   @ModelName@_low_scale_constraint<T>  low_scale_constraint;
    double high_scale, susy_scale, low_scale;
 };
 
@@ -94,6 +88,10 @@ void @ModelName@_spectrum_generator<T>::run(const softsusy::QedQcd& qedqcd,
    model.set_thresholds(this->settings.get(Spectrum_generator_settings::threshold_corrections_loop_order));
    model.set_zero_threshold(this->settings.get(Spectrum_generator_settings::beta_zero_threshold));
 
+   @ModelName@_high_scale_constraint<T> high_scale_constraint;
+   @ModelName@_susy_scale_constraint<T> susy_scale_constraint;
+   @ModelName@_low_scale_constraint<T>  low_scale_constraint;
+
    high_scale_constraint.clear();
    susy_scale_constraint.clear();
    low_scale_constraint .clear();
diff --git a/templates/low_scale_spectrum_generator.hpp.in b/templates/low_scale_spectrum_generator.hpp.in
index 8edbcb31b..cc2aee4bd 100644
--- a/templates/low_scale_spectrum_generator.hpp.in
+++ b/templates/low_scale_spectrum_generator.hpp.in
@@ -45,8 +45,6 @@ class @ModelName@_spectrum_generator
 public:
    @ModelName@_spectrum_generator()
       : @ModelName@_spectrum_generator_interface<T>()
-      , susy_scale_constraint()
-      , low_scale_constraint()
       , susy_scale(0.)
       , low_scale(0.)
    {}
@@ -60,8 +58,6 @@ public:
    void write_running_couplings(const std::string& filename = "@ModelName@_rgflow.dat") const;
 
 private:
-   @ModelName@_susy_scale_constraint<T> susy_scale_constraint;
-   @ModelName@_low_scale_constraint<T>  low_scale_constraint;
    double susy_scale, low_scale;
 };
 
@@ -90,6 +86,9 @@ void @ModelName@_spectrum_generator<T>::run(const softsusy::QedQcd& qedqcd,
    model.set_thresholds(this->settings.get(Spectrum_generator_settings::threshold_corrections_loop_order));
    model.set_zero_threshold(this->settings.get(Spectrum_generator_settings::beta_zero_threshold));
 
+   @ModelName@_susy_scale_constraint<T> susy_scale_constraint;
+   @ModelName@_low_scale_constraint<T>  low_scale_constraint;
+
    susy_scale_constraint.clear();
    low_scale_constraint .clear();
 
diff --git a/templates/standard_model_high_scale_spectrum_generator.hpp.in b/templates/standard_model_high_scale_spectrum_generator.hpp.in
index 21ddedce5..3c4c31493 100644
--- a/templates/standard_model_high_scale_spectrum_generator.hpp.in
+++ b/templates/standard_model_high_scale_spectrum_generator.hpp.in
@@ -51,10 +51,6 @@ class @ModelName@_spectrum_generator
 public:
    @ModelName@_spectrum_generator()
       : @ModelName@_spectrum_generator_interface<T>()
-      , high_scale_constraint()
-      , susy_scale_constraint()
-      , low_scale_constraint()
-      , matching()
       , eft()
       , high_scale(0.)
       , susy_scale(0.)
@@ -71,10 +67,6 @@ public:
    void write_running_couplings(const std::string& filename = "@ModelName@_rgflow.dat") const;
 
 private:
-   @ModelName@_high_scale_constraint<T> high_scale_constraint;
-   @ModelName@_susy_scale_constraint<T> susy_scale_constraint;
-   standard_model::Standard_model_low_scale_constraint<T>  low_scale_constraint;
-   @ModelName@_standard_model_Matching<T> matching;
    standard_model::StandardModel<T> eft;
    double high_scale, susy_scale, low_scale;
 };
@@ -116,6 +108,10 @@ void @ModelName@_spectrum_generator<T>::run(const softsusy::QedQcd& qedqcd,
    eft.set_number_of_mass_iterations(this->model.get_number_of_mass_iterations());
    eft.set_two_loop_corrections(this->model.get_two_loop_corrections());
 
+   @ModelName@_high_scale_constraint<T> high_scale_constraint;
+   @ModelName@_susy_scale_constraint<T> susy_scale_constraint;
+   standard_model::Standard_model_low_scale_constraint<T>  low_scale_constraint;
+
    high_scale_constraint.clear();
    susy_scale_constraint.clear();
    low_scale_constraint .clear();
@@ -129,6 +125,7 @@ void @ModelName@_spectrum_generator<T>::run(const softsusy::QedQcd& qedqcd,
 
    const unsigned index = this->settings.get(Spectrum_generator_settings::eft_higgs_index);
 
+   @ModelName@_standard_model_Matching<T> matching;
    matching.set_models(&eft, &model);
    matching.set_constraint(&susy_scale_constraint);
    matching.set_scale(this->settings.get(Spectrum_generator_settings::eft_matching_scale));
diff --git a/templates/standard_model_low_scale_spectrum_generator.hpp.in b/templates/standard_model_low_scale_spectrum_generator.hpp.in
index 0661aa7c7..2e1faeb35 100644
--- a/templates/standard_model_low_scale_spectrum_generator.hpp.in
+++ b/templates/standard_model_low_scale_spectrum_generator.hpp.in
@@ -50,9 +50,6 @@ class @ModelName@_spectrum_generator
 public:
    @ModelName@_spectrum_generator()
       : @ModelName@_spectrum_generator_interface<T>()
-      , susy_scale_constraint()
-      , low_scale_constraint()
-      , matching()
       , eft()
       , susy_scale(0.)
       , low_scale(0.)
@@ -68,9 +65,6 @@ public:
    void write_running_couplings(const std::string& filename = "@ModelName@_rgflow.dat") const;
 
 private:
-   @ModelName@_susy_scale_constraint<T> susy_scale_constraint;
-   standard_model::Standard_model_low_scale_constraint<T>  low_scale_constraint;
-   @ModelName@_standard_model_Matching<T> matching;
    standard_model::StandardModel<T> eft;
    double susy_scale, low_scale;
 };
@@ -112,6 +106,9 @@ void @ModelName@_spectrum_generator<T>::run(const softsusy::QedQcd& qedqcd,
    eft.set_number_of_mass_iterations(this->model.get_number_of_mass_iterations());
    eft.set_two_loop_corrections(this->model.get_two_loop_corrections());
 
+   @ModelName@_susy_scale_constraint<T> susy_scale_constraint;
+   standard_model::Standard_model_low_scale_constraint<T>  low_scale_constraint;
+
    susy_scale_constraint.clear();
    low_scale_constraint .clear();
 
@@ -123,6 +120,7 @@ void @ModelName@_spectrum_generator<T>::run(const softsusy::QedQcd& qedqcd,
 
    const unsigned index = this->settings.get(Spectrum_generator_settings::eft_higgs_index);
 
+   @ModelName@_standard_model_Matching<T> matching;
    matching.set_models(&eft, &model);
    matching.set_constraint(&susy_scale_constraint);
    matching.set_scale(this->settings.get(Spectrum_generator_settings::eft_matching_scale));