diff --git a/builtins/src/main/java/org/jline/builtins/Builtins.java b/builtins/src/main/java/org/jline/builtins/Builtins.java
index 088821937..e2428decb 100644
--- a/builtins/src/main/java/org/jline/builtins/Builtins.java
+++ b/builtins/src/main/java/org/jline/builtins/Builtins.java
@@ -389,25 +389,25 @@ private List<Completer> lessCompleter(String name) {
     private List<Completer> historyCompleter(String name) {
         List<Completer> completers = new ArrayList<>();
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                                            , new OptionCompleter(new NullCompleter()
+                                            , new OptionCompleter(NullCompleter.INSTANCE
                                                                 , this::commandOptions
                                                                 , 1)
                                        ));
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                     , new StringsCompleter(Arrays.asList("-A", "-W", "-R", "-AI", "-RI", "-WI")), new FilesCompleter(workDir.get(), true), new NullCompleter()));
+                     , new StringsCompleter(Arrays.asList("-A", "-W", "-R", "-AI", "-RI", "-WI")), new FilesCompleter(workDir.get(), true), NullCompleter.INSTANCE));
         return completers;
     }
 
     private List<Completer> widgetCompleter(String name) {
         List<Completer> completers = new ArrayList<>();
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                                            , new OptionCompleter(new NullCompleter()
+                                            , new OptionCompleter(NullCompleter.INSTANCE
                                                                 , this::commandOptions
                                                                 , 1)
                                        ));
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
                      , new StringsCompleter("-A"), new StringsCompleter(() -> allWidgets())
-                     , new StringsCompleter(() -> reader.getWidgets().keySet()), new NullCompleter()));
+                     , new StringsCompleter(() -> reader.getWidgets().keySet()), NullCompleter.INSTANCE));
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
                      , new StringsCompleter("-D"), new StringsCompleter(() -> reader.getWidgets().keySet())));
         return completers;
@@ -416,7 +416,7 @@ private List<Completer> widgetCompleter(String name) {
     private List<Completer> keymapCompleter(String name) {
         List<Completer> completers = new ArrayList<>();
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                                            , new OptionCompleter(new NullCompleter()
+                                            , new OptionCompleter(NullCompleter.INSTANCE
                                                                 , this::commandOptions
                                                                 , 1)
                         ));
@@ -426,7 +426,7 @@ private List<Completer> keymapCompleter(String name) {
     private List<Completer> setvarCompleter(String name) {
         List<Completer> completers = new ArrayList<>();
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                     , new StringsCompleter(() -> reader.getVariables().keySet()), new NullCompleter()));
+                     , new StringsCompleter(() -> reader.getVariables().keySet()), NullCompleter.INSTANCE));
         return completers;
     }
 
@@ -447,7 +447,7 @@ private List<Completer> unsetoptCompleter(String name) {
     private List<Completer> ttopCompleter(String name) {
         List<Completer> completers = new ArrayList<>();
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                                            , new OptionCompleter(new NullCompleter()
+                                            , new OptionCompleter(NullCompleter.INSTANCE
                                                                 , this::commandOptions
                                                                 , 1)
                                     ));
diff --git a/builtins/src/main/java/org/jline/builtins/Completers.java b/builtins/src/main/java/org/jline/builtins/Completers.java
index c724a2b57..15d4cb660 100644
--- a/builtins/src/main/java/org/jline/builtins/Completers.java
+++ b/builtins/src/main/java/org/jline/builtins/Completers.java
@@ -792,6 +792,8 @@ public void complete(LineReader reader, final ParsedLine commandLine, List<Candi
                 }
                 if (args < argsCompleters.size()) {
                     argsCompleters.get(args).complete(reader, commandLine, candidates);
+                } else {
+                    argsCompleters.get(argsCompleters.size() - 1).complete(reader, commandLine, candidates);
                 }
             } else {
                 argsCompleters.get(0).complete(reader, commandLine, candidates);