diff --git a/pom.xml b/pom.xml
index f635359..f03afb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>me.clip</groupId>
     <artifactId>placeholderapi</artifactId>
 
-    <version>2.8.5</version>
+    <version>2.8.5-Dev-${BUILD_NUMBER}</version>
     <name>PlaceholderAPI</name>
     <description>An awesome placeholder provider!</description>
     <url>http://extendedclip.com</url>
diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java
index fcd6433..5d5079f 100644
--- a/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java
+++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPI.java
@@ -200,7 +200,7 @@ public class PlaceholderAPI {
 			if (hooks.containsKey(identifier)) {
 				String value = hooks.get(identifier).onPlaceholderRequest(player, params);
 				if (value != null) {
-					text = text.replaceAll(m.group(), Matcher.quoteReplacement(value));
+					text = text.replaceAll(Pattern.quote(m.group()), Matcher.quoteReplacement(value));
 				}
 			}
 		}
@@ -250,7 +250,7 @@ public class PlaceholderAPI {
 		    	Relational rel = (Relational) hooks.get(identifier);
 		    	String value = rel.onPlaceholderRequest(one, two, params);
 				if (value != null) {
-					text = text.replaceAll(m.group(), Matcher.quoteReplacement(value));
+					text = text.replaceAll(Pattern.quote(m.group()), Matcher.quoteReplacement(value));
 				}
 		    }
 		}