diff --git a/web/admin/problem_add.php b/web/admin/problem_add.php
index e677422..31c0deb 100644
--- a/web/admin/problem_add.php
+++ b/web/admin/problem_add.php
@@ -12,24 +12,29 @@ require_once ("../include/problem.php");
 
 // contest_id
 $title = $_POST['title'];
-$title = str_replace(",", ",", $title);
+// $title = str_replace(",", ",", $title);
+$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+
 $time_limit = $_POST['time_limit'];
 $memory_limit = $_POST['memory_limit'];
 
 $description = $_POST['description'];
 //$description = str_replace("<p>", "", $description); 
 //$description = str_replace("</p>", "<br />", $description);
-$description = str_replace(",", "&#44;", $description); 
+// $description = str_replace(",", "&#44;", $description); 
+$description = html_entity_decode($description, ENT_QUOTES, 'UTF-8');
 
 $input = $_POST['input'];
 //$input = str_replace("<p>", "", $input); 
 //$input = str_replace("</p>", "<br />", $input); 
-$input = str_replace(",", "&#44;", $input);
+// $input = str_replace(",", "&#44;", $input);
+$input = html_entity_decode($input, ENT_QUOTES, 'UTF-8');
 
 $output = $_POST['output'];
 //$output = str_replace("<p>", "", $output); 
 //$output = str_replace("</p>", "<br />", $output);
-$output = str_replace(",", "&#44;", $output); 
+// $output = str_replace(",", "&#44;", $output);
+$output = html_entity_decode($output, ENT_QUOTES, 'UTF-8');
 
 $sample_input = $_POST['sample_input'];
 $sample_output = $_POST['sample_output'];
@@ -44,7 +49,8 @@ if ($test_output=="") $test_output="\n";
 $hint = $_POST['hint'];
 //$hint = str_replace("<p>", "", $hint); 
 //$hint = str_replace("</p>", "<br />", $hint); 
-$hint = str_replace(",", "&#44;", $hint);
+// $hint = str_replace(",", "&#44;", $hint);
+$hint = html_entity_decode($hint, ENT_QUOTES, 'UTF-8');
 
 $source = $_POST['source'];
 
diff --git a/web/admin/problem_edit.php b/web/admin/problem_edit.php
index ac456a4..a535100 100644
--- a/web/admin/problem_edit.php
+++ b/web/admin/problem_edit.php
@@ -227,7 +227,7 @@ include_once("kindeditor.php") ;
       if (!(isset($_SESSION[$OJ_NAME.'_'."p$id"]) || isset($_SESSION[$OJ_NAME.'_'.'administrator']) || isset($_SESSION[$OJ_NAME.'_'.'problem_editor']) )) exit();
 
       $title = $_POST['title'];
-      $title = str_replace(",", "&#44;", $title);
+      $title = html_entity_decode($title,ENT_QUOTES,"UTF-8");
 
       $time_limit = $_POST['time_limit'];