diff --git a/src/main/java/fr/imirhil/april/hebdobot/Bot.java b/src/main/java/fr/imirhil/april/hebdobot/Bot.java
index 91324ee..a43ec1f 100644
--- a/src/main/java/fr/imirhil/april/hebdobot/Bot.java
+++ b/src/main/java/fr/imirhil/april/hebdobot/Bot.java
@@ -45,10 +45,10 @@ public class Bot extends PircBot {
 					this.startCollectiveTopic(sender, message);
 				} else if (message.startsWith("#")) {
 					this.startIndividualTopic(sender, message);
-				} else if (message.startsWith("%")) {
-					this.addToCurrentTopic(raw);
 				} else if (message.startsWith("!")) {
-					this.handleCommand(message.replaceFirst("!", ""));
+					this.handleCommand(message);
+				} else if (!message.startsWith("%")) {
+					this.addToCurrentTopic(raw);
 				}
 			}
 
@@ -58,7 +58,8 @@ public class Bot extends PircBot {
 		}
 	}
 
-	private void handleCommand(final String message) {
+	private void handleCommand(String message) {
+		message = message.replaceFirst("!", "");
 		if (message.startsWith("courant")) {
 			if (this.currentTopic != null) {
 				this.sendMessage(this.channel, "Topic courant : "