diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index da408af46..62337ccd5 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -517,8 +517,8 @@ void CLI2::prepareFilter (bool applyContext)
   findUUIDs ();
   insertIDExpr ();
   desugarFilterTags ();
-/*
   findStrayModifications ();
+/*
   desugarFilterAttributes ();
   desugarFilterAttributeModifiers ();
   desugarFilterPatterns ();
@@ -942,7 +942,6 @@ void CLI2::desugarFilterTags ()
   }
 }
 
-/*
 ////////////////////////////////////////////////////////////////////////////////
 void CLI2::findStrayModifications ()
 {
@@ -965,9 +964,10 @@ void CLI2::findStrayModifications ()
 
   if (changes)
     if (context.config.getInteger ("debug.parser") >= 3)
-      context.debug (dump ("CLI2::analyze findStrayModifications"));
+      context.debug (dump ("CLI2::prepareFilter findStrayModifications"));
 }
 
+/*
 ////////////////////////////////////////////////////////////////////////////////
 // <name>:['"][<value>]['"] --> name = value
 void CLI2::desugarFilterAttributes ()
diff --git a/src/CLI2.h b/src/CLI2.h
index a5f54b614..b9d673099 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -101,8 +101,8 @@ private:
   bool findCommand ();
   bool exactMatch (const std::string&, const std::string&) const;
   void desugarFilterTags ();
-/*
   void findStrayModifications ();
+/*
   void desugarFilterAttributes ();
   void desugarFilterAttributeModifiers ();
   void desugarFilterPatterns ();