diff --git a/builtins/src/main/java/org/jline/builtins/Builtins.java b/builtins/src/main/java/org/jline/builtins/Builtins.java
index e2428decb..3b10025c5 100644
--- a/builtins/src/main/java/org/jline/builtins/Builtins.java
+++ b/builtins/src/main/java/org/jline/builtins/Builtins.java
@@ -369,7 +369,7 @@ private Set<String> allWidgets() {
     private List<Completer> nanoCompleter(String name) {
         List<Completer> completers = new ArrayList<>();
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                                           , new OptionCompleter(new FilesCompleter(workDir.get(), true)
+                                           , new OptionCompleter(new FilesCompleter(workDir)
                                                                , this::commandOptions
                                                                , 1)
                                             ));
@@ -379,7 +379,7 @@ private List<Completer> nanoCompleter(String name) {
     private List<Completer> lessCompleter(String name) {
         List<Completer> completers = new ArrayList<>();
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                                           , new OptionCompleter(new FilesCompleter(workDir.get(), true)
+                                           , new OptionCompleter(new FilesCompleter(workDir)
                                                                , this::commandOptions
                                                                , 1)
                                        ));
@@ -394,7 +394,8 @@ private List<Completer> historyCompleter(String name) {
                                                                 , 1)
                                        ));
         completers.add(new ArgumentCompleter(new StringsCompleter(name)
-                     , new StringsCompleter(Arrays.asList("-A", "-W", "-R", "-AI", "-RI", "-WI")), new FilesCompleter(workDir.get(), true), NullCompleter.INSTANCE));
+                                           , new StringsCompleter(Arrays.asList("-A", "-W", "-R", "-AI", "-RI", "-WI"))
+                                           , new FilesCompleter(workDir), NullCompleter.INSTANCE));
         return completers;
     }