diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
index 80248ab5..417c3fd8 100644
--- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
@@ -262,6 +262,10 @@ public class BukkitCommandManager extends CommandManager<
         return null;
     }
 
+    public Locale setPlayerLocale(Player player, Locale locale) {
+        return this.setIssuerLocale(player, locale);
+    }
+
     void readPlayerLocale(Player player) {
         if (!player.isOnline() || cantReadLocale) {
             return;
diff --git a/core/src/main/java/co/aikar/commands/CommandManager.java b/core/src/main/java/co/aikar/commands/CommandManager.java
index d8a6df39..1f2b0e85 100644
--- a/core/src/main/java/co/aikar/commands/CommandManager.java
+++ b/core/src/main/java/co/aikar/commands/CommandManager.java
@@ -196,7 +196,7 @@ public abstract class CommandManager <
     public abstract boolean hasRegisteredCommands();
     public abstract boolean isCommandIssuer(Class<?> type);
 
-    // TODO: Change this to I if we make a breaking change
+    // TODO: Change this to IT if we make a breaking change
     public abstract I getCommandIssuer(Object issuer);
 
     public abstract RootCommand createRootCommand(String cmd);
diff --git a/sponge/src/main/java/co/aikar/commands/SpongeCommandIssuer.java b/sponge/src/main/java/co/aikar/commands/SpongeCommandIssuer.java
index b3f95979..f6165037 100644
--- a/sponge/src/main/java/co/aikar/commands/SpongeCommandIssuer.java
+++ b/sponge/src/main/java/co/aikar/commands/SpongeCommandIssuer.java
@@ -25,6 +25,7 @@ package co.aikar.commands;
 
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.api.command.CommandSource;
+import org.spongepowered.api.command.source.ConsoleSource;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.text.serializer.TextSerializers;
 import org.spongepowered.api.util.Identifiable;
@@ -55,7 +56,7 @@ public class SpongeCommandIssuer implements CommandIssuer {
 
     @Override
     public @NotNull UUID getUniqueId() {
-        if (isPlayer()) {
+        if (this.source instanceof Identifiable) {
             return ((Identifiable) source).getUniqueId();
         }