diff --git a/src/CLI.cpp b/src/CLI.cpp
index a6c97f76e..13832459b 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -241,9 +241,10 @@ void CLI::alias (const std::string& name, const std::string& value)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void CLI::entity (const std::string& name, const std::string& value)
+void CLI::entity (const std::string& category, const std::string& name)
 {
-  _entities.insert (std::pair <std::string, std::string> (name, value));
+  if (_entities.find (category) == _entities.end ())
+    _entities.insert (std::pair <std::string, std::string> (category, name));
 }
 
 ////////////////////////////////////////////////////////////////////////////////