diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
index d370511a6..d1df85b16 100644
--- a/src/main/java/picocli/CommandLine.java
+++ b/src/main/java/picocli/CommandLine.java
@@ -18711,7 +18711,7 @@ private static String str(List<String> list) {
         private List<String> prefixCommandName(List<String> suggestions)
         {
             String commandName = this.commandLine.commandSpec.name;
-            if(commandName == null || commandName.trim().isEmpty()) { return suggestions; }
+            if(commandName == null || commandName.trim().length() == 0) { return suggestions; }
             List<String> prefixedSuggestions = new ArrayList<String>();
             for (String s : suggestions) {
                 prefixedSuggestions.add(commandName + " " + s);