diff --git a/core/src/main/java/co/aikar/commands/CommandCompletionContext.java b/core/src/main/java/co/aikar/commands/CommandCompletionContext.java
index 3211626e..41382c55 100644
--- a/core/src/main/java/co/aikar/commands/CommandCompletionContext.java
+++ b/core/src/main/java/co/aikar/commands/CommandCompletionContext.java
@@ -101,7 +101,7 @@ public class CommandCompletionContext<I extends CommandIssuer> {
             }
         }
         //noinspection unchecked
-        Map<String, Object> resolved = command.resolveContexts(issuer, args, args.size());
+        Map<String, Object> resolved = command.resolveContexts(issuer, args, args.size() - 1);
         if (resolved == null || paramIdx > resolved.size()) {
             this.command.scope.manager.log(LogLevel.ERROR, "resolved: " + resolved + " paramIdx: " + paramIdx + " - size: " + (resolved != null ? resolved.size() : null));
             ACFUtil.sneaky(new CommandCompletionTextLookupException());