diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
index 8d16df306..5818bedcf 100644
--- a/meta/FlexibleSUSY.m
+++ b/meta/FlexibleSUSY.m
@@ -2108,26 +2108,24 @@ corresponding tadpole is real or imaginary (only in models with CP
              ];
            WriteInitialGuesserClass[FlexibleSUSY`InitialGuessAtLowScale,
                                     FlexibleSUSY`InitialGuessAtHighScale,
-                                    {{FileNameJoin[{Global`$flexiblesusyTemplateDir, "initial_guesser.hpp.in"}],
-                                      FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_initial_guesser.hpp"}]},
-                                     {FileNameJoin[{Global`$flexiblesusyTemplateDir, "two_scale_" <> initialGuesserInputFile <> ".hpp.in"}],
-                                      FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_two_scale_initial_guesser.hpp"}]},
-                                     {FileNameJoin[{Global`$flexiblesusyTemplateDir, "two_scale_" <> initialGuesserInputFile <> ".cpp.in"}],
-                                      FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_two_scale_initial_guesser.cpp"}]}
-                                    }
+                                    Join[
+                                        {{FileNameJoin[{Global`$flexiblesusyTemplateDir, "initial_guesser.hpp.in"}],
+                                          FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_initial_guesser.hpp"}]},
+                                         {FileNameJoin[{Global`$flexiblesusyTemplateDir, "two_scale_" <> initialGuesserInputFile <> ".hpp.in"}],
+                                          FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_two_scale_initial_guesser.hpp"}]},
+                                         {FileNameJoin[{Global`$flexiblesusyTemplateDir, "two_scale_" <> initialGuesserInputFile <> ".cpp.in"}],
+                                          FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_two_scale_initial_guesser.cpp"}]}}
+                                        ,
+                                        If[HaveSolver[FlexibleSUSY`RootSolver],
+                                           {{FileNameJoin[{Global`$flexiblesusyTemplateDir, "root_" <> initialGuesserInputFile <> ".hpp.in"}],
+                                             FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_root_initial_guesser.hpp"}]},
+                                            {FileNameJoin[{Global`$flexiblesusyTemplateDir, "root_" <> initialGuesserInputFile <> ".cpp.in"}],
+                                             FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_root_initial_guesser.cpp"}]}},
+                                           {}
+                                          ]
+                                        ]
                                    ];
 
-           If[HaveSolver[FlexibleSUSY`RootSolver],
-              Print["Creating class for root initial guesser ..."];
-              WriteInitialGuesserClass[FlexibleSUSY`InitialGuessAtLowScale,
-                                       FlexibleSUSY`InitialGuessAtHighScale,
-                                       {{FileNameJoin[{Global`$flexiblesusyTemplateDir, "root_" <> initialGuesserInputFile <> ".hpp.in"}],
-                                         FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_root_initial_guesser.hpp"}]},
-                                        {FileNameJoin[{Global`$flexiblesusyTemplateDir, "root_" <> initialGuesserInputFile <> ".cpp.in"}],
-                                         FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_root_initial_guesser.cpp"}]}}
-                                      ];
-             ];
-
            (* determin diagonalization precision for each particle *)
            diagonalizationPrecision = ReadPoleMassPrecisions[
                DefaultPoleMassPrecision,
@@ -2171,23 +2169,23 @@ corresponding tadpole is real or imaginary (only in models with CP
            PrintHeadline["Creating SLHA model"];
            Print["Creating class for SLHA two-scale model ..."];
            WriteModelSLHAClass[massMatrices,
-                               {{FileNameJoin[{Global`$flexiblesusyTemplateDir, "model_slha.hpp.in"}],
-                                 FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_model_slha.hpp"}]},
-                                {FileNameJoin[{Global`$flexiblesusyTemplateDir, "two_scale_model_slha.hpp.in"}],
-                                 FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_two_scale_model_slha.hpp"}]},
-                                {FileNameJoin[{Global`$flexiblesusyTemplateDir, "two_scale_model_slha.cpp.in"}],
-                                 FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_two_scale_model_slha.cpp"}]}
-                               }];
-
-           If[HaveSolver[FlexibleSUSY`RootSolver],
-              Print["Creating class for SLHA root model ..."];
-              WriteModelSLHAClass[massMatrices,
-                                  {{FileNameJoin[{Global`$flexiblesusyTemplateDir, "root_model_slha.hpp.in"}],
-                                    FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_root_model_slha.hpp"}]},
-                                   {FileNameJoin[{Global`$flexiblesusyTemplateDir, "root_model_slha.cpp.in"}],
-                                    FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_root_model_slha.cpp"}]}}
-                                 ];
-             ];
+                               Join[
+                                   {{FileNameJoin[{Global`$flexiblesusyTemplateDir, "model_slha.hpp.in"}],
+                                     FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_model_slha.hpp"}]},
+                                    {FileNameJoin[{Global`$flexiblesusyTemplateDir, "two_scale_model_slha.hpp.in"}],
+                                     FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_two_scale_model_slha.hpp"}]},
+                                    {FileNameJoin[{Global`$flexiblesusyTemplateDir, "two_scale_model_slha.cpp.in"}],
+                                     FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_two_scale_model_slha.cpp"}]}}
+                                   ,
+                                   If[HaveSolver[FlexibleSUSY`RootSolver],
+                                      {{FileNameJoin[{Global`$flexiblesusyTemplateDir, "root_model_slha.hpp.in"}],
+                                        FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_root_model_slha.hpp"}]},
+                                       {FileNameJoin[{Global`$flexiblesusyTemplateDir, "root_model_slha.cpp.in"}],
+                                        FileNameJoin[{Global`$flexiblesusyOutputDir, FlexibleSUSY`FSModelName <> "_root_model_slha.cpp"}]}},
+                                      {}
+                                     ]
+                                   ]
+                              ];
 
            PrintHeadline["Creating model"];
            Print["Creating class for model ..."];