diff --git a/ChangeLog b/ChangeLog
index 9a90bd623..72583af1e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2004-05-10 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis).
+    * left.php: commit for Garvin: fix for wrong group expanding (group
+      name containing foreign characters)
 
 2004-05-10 Michal Čihař  <michal@cihar.com>
     * libraries/dbi/mysql.dbi.lib.php: Fix PMA_DBI_field_name, fixes also bug
diff --git a/left.php b/left.php
index b085bcc3b..835c8f0d7 100644
--- a/left.php
+++ b/left.php
@@ -77,7 +77,9 @@ function PMA_indent($spaces) {
 
 function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_level, $val, $childout = true) {
     $name = $key;
-    $id = preg_replace('@[^a-z0-9]*@i', '', $baseid . $keyhistory . $key) . $indent;
+    //$id = preg_replace('@[^a-z0-9]*@i', '', $baseid . $keyhistory . $key) . $indent;
+    $id = base64_encode($baseid . $keyhistory . $key) . $indent;
+
     $groupkey = $keyhistory . ($key != $keyhistory ? $GLOBALS['cfg']['LeftFrameTableSeparator'] . $key : '');
 
     $on_mouse = (($GLOBALS['cfg']['LeftPointerColor'] == '') ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $id . '\', \'' . $GLOBALS['cfg']['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $id . '\', \'' . $GLOBALS['cfg']['LeftBgColor'] . '\')}"');