diff --git a/BaseLib/ConfigTreeNew.cpp b/BaseLib/ConfigTreeNew.cpp
index 8d461e2233a0c04485d1b94d124e935ed6c96c57..1943d1baa4a9a5cac97915d37c0948683928687a 100644
--- a/BaseLib/ConfigTreeNew.cpp
+++ b/BaseLib/ConfigTreeNew.cpp
@@ -298,10 +298,10 @@ ConfigTreeNew::checkAndInvalidate()
 
     for (auto const& p : _visited_params)
     {
-        auto const& tag   = std::get<1>(p.first);
+        auto const& tag   = p.first.second;
         auto const& count = p.second.count;
 
-        if (std::get<0>(p.first)) { // tag
+        if (p.first.first) { // tag
             if (count > 0) {
                 warning("XML attribute \"" + tag + "\" has been read " + std::to_string(count)
                         + " time(s) more than it was present in the configuration tree.");
diff --git a/BaseLib/ConfigTreeNew.h b/BaseLib/ConfigTreeNew.h
index f96c476ecadc733782a56c6069cf273f5c28b4fc..291ea5f16e0aa02eb37fe94ed42cc41fc6f16ca1 100644
--- a/BaseLib/ConfigTreeNew.h
+++ b/BaseLib/ConfigTreeNew.h
@@ -147,7 +147,7 @@ public:
             // tell the _parent instance that a setting now has been parsed.
             if (_has_incremented) {
                 _has_incremented = false;
-                _parent.markVisited<ValueType>(_tagname, false);
+                _parent.markVisited<ValueType>(_tagname, false, false);
             }
             return ConfigTreeNew(_it->second, _parent, _tagname).getValue<ValueType>();
         }
@@ -384,7 +384,7 @@ private:
      */
     template<typename T>
     CountType& markVisited(std::string const& key, bool const is_attr,
-                           bool peek_only = false) const;
+                           bool peek_only) const;
 
     /*! Keeps track of the key \c key and its value type ConfigTree.
      *
@@ -392,7 +392,7 @@ private:
      *
      * \c param peek_only if true, do not change the read-count of the given key.
      */
-    CountType& markVisited(std::string const& key, bool const peek_only = false) const;
+    CountType& markVisited(std::string const& key, bool const peek_only) const;
 
     //! Used in the destructor to compute the difference between number of reads of a parameter
     //! and the number of times it exists in the ConfigTree