diff --git a/ChangeLog b/ChangeLog
index f1ced53f5..7094d6eaf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $Source$
     * lang/czech: Translation fixes.
     * libraries/common.lib.php: Group databases by rightmost separator (bug
       #1325651).
+    * libraries/string.lib.php: Fix escaping detection on multi byte strings.
 
 2005-10-17 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * css/phpmyadmin.css.php: border around tabs bug #1326730
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index 694c2e7d9..6d4083993 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -134,7 +134,7 @@ function PMA_STR_charIsEscaped($string, $pos, $start = 0)
 
     $p           = $pos - 1;
     $escaped     = FALSE;
-    while (($p >= $start) && ($string[$p] == '\\')) {
+    while (($p >= $start) && (PMA_substr($string, $p, 1) == '\\')) {
         $escaped = !$escaped;
         $p--;
     } // end while