diff --git a/CHANGELOG.md b/CHANGELOG.md
index 647b207e..58020f96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -123,6 +123,8 @@ Users may have to change how they access the system
 
 ### Corrected Bugs
 
+* Fixed: [Keywords containing '-' hyphen are missing from the auto-completion list](https://github.com/clicon/clixon/issues/330)
+  * Fixed by disabling `cligen_preference_mode`. This may have other side effects.
 * Fixed: [Returning a string while Querying leaf-list for single entry](https://github.com/clicon/clixon/issues/326)
 * Fixed: A long TLS+HTTP/2 request such as by a browser causing block of other requests.
 * Fixed: [Error message seen twice in some cases](https://github.com/clicon/clixon/issues/325)
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index b95c18dd..f199799e 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -781,8 +781,13 @@ main(int    argc,
     /* Join rest of argv to a single command */
     restarg = clicon_strjoin(argc, argv, " ");
 
-    /* If several cligen object variables match same preference, select first */
-    cligen_preference_mode_set(cli_cligen(h), 1);
+    /* If several cligen object variables match same preference, select first 
+     * There is some unclarities if this should be set to 0 or 1.
+     * By default in CLIgen, it is 0
+     * It used to be 1 in Clixon. But see eg https://github.com/clicon/clixon/issues/330
+     * There may be cases where there will be "ambiguous".
+     */
+    cligen_preference_mode_set(cli_cligen(h), 0);
 
     /* Call start function in all plugins before we go interactive 
      */