diff --git a/CommandFramework/CommandFrameworkBase/src/de/steamwar/command/handler/EndsWithHandler.java b/CommandFramework/CommandFrameworkBase/src/de/steamwar/command/handler/EndsWithHandler.java
index bb33502c..d3a51a0a 100644
--- a/CommandFramework/CommandFrameworkBase/src/de/steamwar/command/handler/EndsWithHandler.java
+++ b/CommandFramework/CommandFrameworkBase/src/de/steamwar/command/handler/EndsWithHandler.java
@@ -57,7 +57,7 @@ public final class EndsWithHandler {
                 @Override
                 public Collection<String> tabComplete(Object sender, PreviousArguments previousArguments, String s) {
                     return super.tabComplete(sender, previousArguments, s).stream().map(s1 -> {
-                        if (s1.startsWith(endsWith)) return s1;
+                        if (s1.endsWith(endsWith)) return s1;
                         return s1 + endsWith;
                     }).collect(Collectors.toList());
                 }