diff --git a/src/dev/peerat/backend/routes/admins/puzzle/AddPuzzle.java b/src/dev/peerat/backend/routes/admins/puzzle/AddPuzzle.java
index 02117dc..480b486 100644
--- a/src/dev/peerat/backend/routes/admins/puzzle/AddPuzzle.java
+++ b/src/dev/peerat/backend/routes/admins/puzzle/AddPuzzle.java
@@ -24,7 +24,7 @@ public class AddPuzzle implements Response{
 	@Route(path = "^/admin/puzzle/$", type = POST, needLogin = true)
 	public void exec(Matcher matcher, Context context, HttpReader reader, HttpWriter writer) throws Exception{
 		JsonMap json = reader.readJson();
-		Puzzle puzzle = new Puzzle(-1, json.get("name"), json.get("content"), json.<String>get("soluce").getBytes(), null, json.<Long>get("scoreMax").intValue(), null, -1, null);
+		Puzzle puzzle = new Puzzle(-1, json.get("name"), json.<String>get("content").replace("206\\", "\n").replace("202\\", "\r"), json.<String>get("soluce").replace("206\\", "\n").replace("202\\", "\r").getBytes(), null, json.<Long>get("scoreMax").intValue(), null, -1, null);
 		if(repo.adminAddPuzzle(puzzle, json.<Long>get("chapter").intValue())){
 			context.response(200);
 		}else{
diff --git a/src/dev/peerat/backend/routes/admins/puzzle/EditPuzzle.java b/src/dev/peerat/backend/routes/admins/puzzle/EditPuzzle.java
index 969ba40..99e2b7a 100644
--- a/src/dev/peerat/backend/routes/admins/puzzle/EditPuzzle.java
+++ b/src/dev/peerat/backend/routes/admins/puzzle/EditPuzzle.java
@@ -24,7 +24,7 @@ public class EditPuzzle implements Response{
 	@Route(path = "^/admin/puzzle/(\\d+)$", type = PUT, needLogin = true)
 	public void exec(Matcher matcher, Context context, HttpReader reader, HttpWriter writer) throws Exception{
 		JsonMap json = reader.readJson();
-		Puzzle puzzle = new Puzzle(-1, json.get("name"), json.get("content"), json.<String>get("soluce").getBytes(), null, json.<Long>get("scoreMax").intValue(), null, -1, null);
+		Puzzle puzzle = new Puzzle(-1, json.get("name"), json.<String>get("content").replace("206\\", "\n").replace("202\\", "\r"), json.<String>get("soluce").replace("206\\", "\n").replace("202\\", "\r").getBytes(), null, json.<Long>get("scoreMax").intValue(), null, -1, null);
 		if(repo.adminUpdatePuzzle(Integer.parseInt(matcher.group(1)), puzzle, json.<Long>get("chapter").intValue())){
 			context.response(200);
 		}else{