diff --git a/Smarty.addons.php b/Smarty.addons.php
index 56f507e4..7ddf05d2 100644
--- a/Smarty.addons.php
+++ b/Smarty.addons.php
@@ -695,8 +695,6 @@ function smarty_func_assign_debug_info($args, &$smarty_obj) {
 	
 	$included_templates = $smarty_obj->_smarty_debug_info;
 	
-	$smarty_obj->assign("_debug_expand", $smarty_obj->_smarty_debug_expand);	
-	
 	$smarty_obj->assign("_debug_keys", array_keys($assigned_vars));
 	$smarty_obj->assign("_debug_vals", array_values($assigned_vars));
 	
diff --git a/Smarty.class.php b/Smarty.class.php
index 5ac19d0d..1289aeb5 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -669,7 +669,7 @@ function _generate_debug_output() {
     ob_start();
     $force_compile_orig = $this->force_compile;
     $this->force_compile = true;
-    $compile_path = $this->_get_compile_path($tpl_file);
+    $compile_path = $this->_get_compile_path($this->debug_tpl);
     if ($this->_process_template($this->debug_tpl, $compile_path))
     {
         if ($this->show_info_include) {
diff --git a/demo/index.php b/demo/index.php
index 5acebb36..d3246dde 100644
--- a/demo/index.php
+++ b/demo/index.php
@@ -1,5 +1,7 @@
 <?php
 
+error_reporting(E_ALL);
+
 require("Smarty.class.php");
 
 $smarty = new Smarty;
diff --git a/index.php b/index.php
index 5acebb36..d3246dde 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,7 @@
 <?php
 
+error_reporting(E_ALL);
+
 require("Smarty.class.php");
 
 $smarty = new Smarty;
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 5ac19d0d..1289aeb5 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -669,7 +669,7 @@ function _generate_debug_output() {
     ob_start();
     $force_compile_orig = $this->force_compile;
     $this->force_compile = true;
-    $compile_path = $this->_get_compile_path($tpl_file);
+    $compile_path = $this->_get_compile_path($this->debug_tpl);
     if ($this->_process_template($this->debug_tpl, $compile_path))
     {
         if ($this->show_info_include) {