diff --git a/src/CLI.cpp b/src/CLI.cpp
index 14a33696c..554885433 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -2202,7 +2202,7 @@ bool CLI::isAttribute (const std::string& raw) const
     return false;
 
   // No spaces in name.
-  if (attr.find (' ') != std::string::npos)
+  if (! isName (attr))
     return false;
 
   std::string::size_type dot = attr.find (".");