diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/ColorUtil.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/ColorUtil.java
index 13bebede..3dafa3a9 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/ColorUtil.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/ColorUtil.java
@@ -37,10 +37,9 @@ public class ColorUtil {
 		// At least one color inside.
 		char[] newChars = new char[chars.length - 2];
 		int tgtIndex = 0; // TargetIndex.
-		do{
+		for(tgtIndex = 0; tgtIndex < srcIndex; tgtIndex++){
 			newChars[tgtIndex] = chars[tgtIndex];
-			tgtIndex++;
-		} while (tgtIndex < srcIndex);
+		};
 		for (srcIndex = srcIndex + 2; srcIndex < chars.length; srcIndex++){
 			if (chars[srcIndex] == '&' && srcIndex < chars.length -1 && allColorChars.indexOf(chars[srcIndex + 1]) > -1){
 				// Skip this one;
diff --git a/NCPCore/src/test/java/fr/neatmonster/nocheatplus/test/TestColorUtil.java b/NCPCore/src/test/java/fr/neatmonster/nocheatplus/test/TestColorUtil.java
index 351bd940..53dcc35a 100644
--- a/NCPCore/src/test/java/fr/neatmonster/nocheatplus/test/TestColorUtil.java
+++ b/NCPCore/src/test/java/fr/neatmonster/nocheatplus/test/TestColorUtil.java
@@ -37,7 +37,7 @@ public class TestColorUtil {
 		for (ChatColor color : ChatColor.values()){
 			char c = color.getChar();
 			for (String[] pattern : generic){
-				pattern[0] = pattern[0].replace('/', c);
+				items.add(new String[]{ pattern[0].replace('/', c), pattern[1]});
 			}
 		}
 		int i = 0;