diff --git a/ChangeLog b/ChangeLog
index c16d454f1..f6c0f7388 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-10-11 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/grab_globals.lib.php3: bug 807047, better fix
+
 2003-10-10 Marc Delisle  <lem9@users.sourceforge.net>
     * footer.inc.php3: bug 819036, undefined function PMA_setHistory()
 
diff --git a/libraries/grab_globals.lib.php3 b/libraries/grab_globals.lib.php3
index 09a1af2db..a112b377a 100644
--- a/libraries/grab_globals.lib.php3
+++ b/libraries/grab_globals.lib.php3
@@ -23,7 +23,7 @@ if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
             if (is_array($value)) {
                 // there could be a variable coming from a cookie of
                 // another application, with the same name as this array
-                unset($GLOBALS[$key]);
+                unset($target[$key]);
 
                 PMA_gpc_extract($value, $target[$key]);
             } else if ($is_magic_quotes) {