diff --git a/cxx/comm_server_configfile.h b/cxx/comm_server_configfile.h
index 27f3bfe..ddd537e 100644
--- a/cxx/comm_server_configfile.h
+++ b/cxx/comm_server_configfile.h
@@ -185,12 +185,12 @@ public:
         fst << "#\n";
 
         for (auto& [key, value] : _currentConfig) {
-            fst << key << " = ";
+            fst << key;
 
             if (auto v_str = std::get_if<1>(&value)) {
-                fst << *v_str;
+                fst << " = " << *v_str;
             } else if (auto v_vec = std::get_if<2>(&value)) {
-                fst << (*v_vec)[0];
+                fst << " = " << (*v_vec)[0];
                 for (size_t i = 1; i < v_vec->size(); ++i) {
                     fst << ", " << (*v_vec)[i];
                 }
diff --git a/cxx/tests/configfile_test.cpp b/cxx/tests/configfile_test.cpp
index daf60ee..d3e6672 100644
--- a/cxx/tests/configfile_test.cpp
+++ b/cxx/tests/configfile_test.cpp
@@ -1,5 +1,4 @@
 #include <iostream>
-#include <strstream>
 
 #include "../comm_server_configfile.h"
 
@@ -14,10 +13,11 @@ int main(int argc, char* argv[])
 
     auto print_cfg = [](auto const& cfg) {
         for (auto& [key, v] : cfg.config()) {
-            std::cout << key << " = ";
+            std::cout << key;
             if (auto v_str = std::get_if<1>(&v)) {
-                std::cout << *v_str;
+                std::cout << " = " << *v_str;
             } else if (auto v_vec = std::get_if<2>(&v)) {
+                std::cout << " = ";
                 for (auto& el : *v_vec) {
                     std::cout << "<" << el << "> ";
                 }
@@ -36,7 +36,8 @@ int main(int argc, char* argv[])
            vec_key = 1,2,3    , 345, 4576, 79
           )--";
 
-    std::istrstream ist(str.c_str());
+    std::stringstream ist;
+    ist << str;
     cfg.load(ist);
 
     std::cout << "From input stream: \n";