diff --git a/NEWS b/NEWS
index c62a5a43..6498a0b5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
-    - optimized for loops with count() function calls (monte)
+    - update $GLOBALS references to work properly with
+      track_globals settings (Michal Prinke, Monte)
+    - fixed bug in math function with call to assign
+      (Grigory V. Kareev, Monte)
+    - optimized for loops with count() function calls (Monte)
     - add month_value_format attribute to html_select_date
       plugin (Gary Loescher, Monte) 
     - made it possible to use simple variables inside [] for
diff --git a/Smarty.class.php b/Smarty.class.php
index 4b9f2b42..44e39703 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -565,7 +565,7 @@ class Smarty
         $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE);
 
         if (!$this->debugging && $this->debugging_ctrl == 'URL'
-               && strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) {
+               && strstr($GLOBALS['HTTP_SERVER_VARS']['QUERY_STRING'], $this->_smarty_debug_id)) {
             $this->debugging = true;
         }
 
@@ -600,7 +600,7 @@ class Smarty
                         $_smarty_results .= $this->_generate_debug_output();
                     }
                     if ($this->cache_modified_check) {
-                        $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+                        $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_SERVER_VARS']['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
                         $gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
                         if (@count($this->_cache_info['insert_tags']) == 0
                             && $gmt_mtime == $last_modified_date) {
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 4b9f2b42..44e39703 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -565,7 +565,7 @@ class Smarty
         $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE);
 
         if (!$this->debugging && $this->debugging_ctrl == 'URL'
-               && strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) {
+               && strstr($GLOBALS['HTTP_SERVER_VARS']['QUERY_STRING'], $this->_smarty_debug_id)) {
             $this->debugging = true;
         }
 
@@ -600,7 +600,7 @@ class Smarty
                         $_smarty_results .= $this->_generate_debug_output();
                     }
                     if ($this->cache_modified_check) {
-                        $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+                        $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_SERVER_VARS']['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
                         $gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
                         if (@count($this->_cache_info['insert_tags']) == 0
                             && $gmt_mtime == $last_modified_date) {