diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 93ba0c9..cc70f59 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java b/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
index 8759d1f..1af8d33 100644
--- a/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
+++ b/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
@@ -100,22 +100,27 @@ public class ChatProcessing {
 		while (cont) {
 
 			int first_under = formattedmessage.indexOf("_");
-			if (first_under != -1 && formattedmessage.indexOf("_", first_under) != -1) // underline
+			if (first_under != -1
+					&& formattedmessage.indexOf("_", first_under + 1) != -1) // underline
 			{
-				formattedmessage = formattedmessage.replaceFirst("_", "§n").replaceFirst("_", "§r");
+				formattedmessage = formattedmessage.replaceFirst("_", "§n")
+						.replaceFirst("_", "§r");
 				continue;
 			}
 
-
 			int first_bold = formattedmessage.indexOf("**");
-			if (first_bold != -1 && formattedmessage.indexOf("**", first_bold) != -1) // bold
+			if (first_bold != -1
+					&& formattedmessage.indexOf("**", first_bold + 1) != -1) // bold
 			{
-				formattedmessage = formattedmessage.replaceFirst("\\*\\*", "§l").replaceFirst("\\*\\*", "§r");
+				formattedmessage = formattedmessage
+						.replaceFirst("\\*\\*", "§l").replaceFirst("\\*\\*",
+								"§r");
 				continue;
 			}
 			int first = formattedmessage.indexOf('*');
-			if (first != -1 && formattedmessage.indexOf('*', first) != -1) {
-				formattedmessage = formattedmessage.replaceFirst("\\*", "§o").replaceFirst("\\*", "§r");
+			if (first != -1 && formattedmessage.indexOf('*', first + 1) != -1) {
+				formattedmessage = formattedmessage.replaceFirst("\\*", "§o")
+						.replaceFirst("\\*", "§r");
 				continue;
 			}
 			cont = false;