diff --git a/src/com/bukkit/mcteam/factions/Factions.java b/src/com/bukkit/mcteam/factions/Factions.java
index 36da5f32..cd17d27f 100644
--- a/src/com/bukkit/mcteam/factions/Factions.java
+++ b/src/com/bukkit/mcteam/factions/Factions.java
@@ -36,7 +36,7 @@ public class Factions extends JavaPlugin {
 		// Register events
 		PluginManager pm = this.getServer().getPluginManager();
 		pm.registerEvent(Event.Type.PLAYER_CHAT, this.playerListener, Event.Priority.Highest, this);
-		pm.registerEvent(Event.Type.PLAYER_COMMAND, this.playerListener, Event.Priority.Normal, this);
+		pm.registerEvent(Event.Type.PLAYER_COMMAND_PREPROCESS, this.playerListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.PLAYER_JOIN, this.playerListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.PLAYER_MOVE, this.playerListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.PLAYER_QUIT, this.playerListener, Event.Priority.Normal, this);
diff --git a/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java b/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java
index 53c30eca..0dcff113 100644
--- a/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java
+++ b/src/com/bukkit/mcteam/factions/listeners/FactionsPlayerListener.java
@@ -27,7 +27,7 @@ public class FactionsPlayerListener extends PlayerListener{
 	 * we handle that command.
 	 */
 	@Override
-	public void onPlayerCommand(PlayerChatEvent event) {
+	public void onPlayerCommandPreprocess(PlayerChatEvent event) {
 		Player player = event.getPlayer();
 		String msg = event.getMessage();