diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index e644054..8aed419 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
index ecb561e..e286ef4 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
@@ -169,7 +169,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
 		MaybeOfflinePlayer player = MaybeOfflinePlayer.AllPlayers.get(event
 				.getPlayer().getUniqueId());
 		String message = event.getMessage();
-		message = message.replace("\"", "''");
+		message = message.replace("\"", "\\\"");
 
 		// URLs
 		String[] parts = message.split("\\s+");
@@ -272,7 +272,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
 		json.append(String
 				.format("{\"text\":\"[%s]%s\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"Copy message\",\"color\":\"blue\"}},clickEvent:{\"action\":\"suggest_command\",\"value\":\"%s\"}},",
 						player.CurrentChannel.DisplayName,
-						(!player.RPMode ? "[OOC]" : ""), event.getMessage().replace("\"", "''")));
+						(!player.RPMode ? "[OOC]" : ""), event.getMessage().replace("\"", "\\\"")));
 		json.append("{\"text\":\" <\"},");
 		json.append(String.format("{\"text\":\"%s%s\",", event.getPlayer()
 				.getDisplayName(), player.GetFormattedFlair()));
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class
index d15fcdb..7e471ee 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ