diff --git a/HolographicDisplays/src/com/gmail/filoghost/holograms/commands/CommandValidator.java b/HolographicDisplays/src/com/gmail/filoghost/holograms/commands/CommandValidator.java
index 6c05917d..1292b3b3 100644
--- a/HolographicDisplays/src/com/gmail/filoghost/holograms/commands/CommandValidator.java
+++ b/HolographicDisplays/src/com/gmail/filoghost/holograms/commands/CommandValidator.java
@@ -54,7 +54,7 @@ public class CommandValidator {
 	@SuppressWarnings("deprecation")
 	public static ItemStack matchItemStack(String input) throws CommandException {
 
-		input = input.replace(" ", ""); // Cut the spaces
+		input = input.replace(" ", ""); // Remove the spaces
 		
 		int dataValue = 0;
 		if (input.contains(":")) {
diff --git a/HolographicDisplays/src/com/gmail/filoghost/holograms/utils/ItemUtils.java b/HolographicDisplays/src/com/gmail/filoghost/holograms/utils/ItemUtils.java
index b7a346a7..023492bf 100644
--- a/HolographicDisplays/src/com/gmail/filoghost/holograms/utils/ItemUtils.java
+++ b/HolographicDisplays/src/com/gmail/filoghost/holograms/utils/ItemUtils.java
@@ -43,17 +43,20 @@ public class ItemUtils {
 	
 	// A map with formatter materials (lowercase and without dashes) for fast access.
 	private static Map<String, Material> materialMap = new HashMap<String, Material>();
-	private static Pattern stripSymbolsPattern = Pattern.compile("_- ");
+	private static Pattern stripSymbolsPattern = Pattern.compile("[_ \\-]+");
 	
 	static {
 		for (Material mat : Material.values()) {
-			materialMap.put(mat.toString().toLowerCase().replace("_", ""), mat);
+			materialMap.put(stripSpacingChars(mat.toString()).toLowerCase(), mat);
 		}
 	}
 	
+	public static String stripSpacingChars(String input) {
+		return stripSymbolsPattern.matcher(input).replaceAll("");
+	}
 	
 	public static Material matchMaterial(String input) {
-		return materialMap.get(stripSymbolsPattern.matcher(input.toLowerCase()).replaceAll(""));
+		return materialMap.get(stripSpacingChars(input).toLowerCase());
 	}
 	
 	@SuppressWarnings("deprecation")