diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7c12385b..dd2289f0 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -33,4 +33,15 @@
       <module name="example-plugin" target="1.8" />
     </bytecodeTargetLevel>
   </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="acf-bukkit" options="-parameters" />
+      <module name="acf-bungee" options="-parameters" />
+      <module name="acf-core" options="-parameters" />
+      <module name="acf-jda" options="-parameters" />
+      <module name="acf-paper" options="-parameters" />
+      <module name="acf-parent" options="-parameters" />
+      <module name="acf-sponge" options="-parameters" />
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/core/src/main/java/co/aikar/commands/CommandContexts.java b/core/src/main/java/co/aikar/commands/CommandContexts.java
index 2f655910..55c0e898 100644
--- a/core/src/main/java/co/aikar/commands/CommandContexts.java
+++ b/core/src/main/java/co/aikar/commands/CommandContexts.java
@@ -45,6 +45,7 @@ public class CommandContexts<R extends CommandExecutionContext<?, ? extends Comm
 
     CommandContexts(CommandManager manager) {
         this.manager = manager;
+        registerContext(CommandIssuer.class, c -> c.getIssuer());
         registerContext(Short.class, (c) -> {
             try {
                 return parseAndValidateNumber(c, Short.MIN_VALUE, Short.MAX_VALUE).shortValue();