diff --git a/app/exawind/exawind.cpp b/app/exawind/exawind.cpp
index 695adde..4d041b0 100644
--- a/app/exawind/exawind.cpp
+++ b/app/exawind/exawind.cpp
@@ -192,8 +192,13 @@ int main(int argc, char** argv)
             if (nalu_node[i].IsMap()) {
                 yaml_replace_instance = nalu_node["replace"];
                 nalu_inpfile = nalu_node["input_file"].as<std::string>();
-                logfile = exawind::NaluWind::logfile_from_input_file_name(
-                    nalu_inpfile, i);
+                // deal with the logfile name
+                if (nalu_node["logfile"]) {
+                    logfile = nalu_node["logfile"].as<std::string>();
+                } else {
+                    logfile = exawind::NaluWind::logfile_from_input_file_name(
+                        nalu_inpfile, i);
+                }
             } else {
                 nalu_inpfile = nalu_node[i].as<std::string>();
                 logfile = exawind::NaluWind::logfile_from_input_file_name(
diff --git a/src/NaluWind.cpp b/src/NaluWind.cpp
index c5062d9..260f70e 100644
--- a/src/NaluWind.cpp
+++ b/src/NaluWind.cpp
@@ -36,11 +36,7 @@ NaluWind::NaluWind(
     const std::string& logfile,
     const std::vector<std::string>& fnames,
     TIOGA::tioga& tg)
-    : m_id(id)
-    , m_comm(comm)
-    , m_doc(inp_yaml)
-    , m_fnames(fnames)
-    , m_sim(m_doc)
+    : m_id(id), m_comm(comm), m_doc(inp_yaml), m_fnames(fnames), m_sim(m_doc)
 {
     auto& env = sierra::nalu::NaluEnv::self();
     env.parallelCommunicator_ = comm;