diff --git a/e107_admin/footer.php b/e107_admin/footer.php
index fa3a21d31..58b9ef66f 100644
--- a/e107_admin/footer.php
+++ b/e107_admin/footer.php
@@ -17,7 +17,9 @@ if (!defined('e107_INIT'))
 {
 	exit;
 }
-$In_e107_Footer = TRUE; // For registered shutdown function
+
+$GLOBALS['E107_IN_FOOTER'] = true;  // For registered shutdown function
+
 
 global $error_handler,$db_time,$ADMIN_FOOTER;
 
@@ -414,7 +416,7 @@ $page = $ehd->getOutput();
 // real output
 echo $page;
 
-unset($In_e107_Footer);
+$GLOBALS['E107_IN_FOOTER'] = false;
 
 
 // Clean session shutdown
diff --git a/e107_core/templates/footer_default.php b/e107_core/templates/footer_default.php
index 60b555a2c..24ed72cbb 100644
--- a/e107_core/templates/footer_default.php
+++ b/e107_core/templates/footer_default.php
@@ -16,7 +16,7 @@ if (!defined('e107_INIT'))
 {
 	exit;
 }
-$In_e107_Footer = TRUE; // For registered shutdown function
+$GLOBALS['E107_IN_FOOTER'] = true; // For registered shutdown function
 
 $magicSC = e107::getRender()->getMagicShortcodes(); // support for {---TITLE---} etc.
 
@@ -437,7 +437,7 @@ echo $page;
 
 
 
-unset($In_e107_Footer);
+$GLOBALS['E107_IN_FOOTER'] = false;
 
 
 // Clean session shutdown
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index 2b78570bf..7c2ff2541 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -1145,19 +1145,18 @@
 		}
 
 
-		global $error_handler,  $In_e107_Footer, $ADMIN_DIRECTORY;
-
-	//	$ADMIN_DIRECTORY = e107::getFolder('admin');
-
-
+		global $error_handler;
+		
 
 		if(!empty($GLOBALS['E107_CLEAN_EXIT']))
 		{
 			return;
 		}
 
-		if(!isset($In_e107_Footer))
+		if(empty($GLOBALS['E107_IN_FOOTER']))
 		{
+			$ADMIN_DIRECTORY = e107::getFolder('admin');
+
 			if(deftrue('ADMIN_AREA'))
 			{
 				$filewanted = realpath(__DIR__) . '/../' . $ADMIN_DIRECTORY . 'footer.php';
@@ -1177,8 +1176,6 @@
 			return;
 		}
 
-//	echo isset($In_e107_Footer) ? "In footer" : "In startup".'<br />';
-
 		while(ob_get_level() > 0)
 		{
 			ob_end_flush();