diff --git a/change_log.txt b/change_log.txt
index 12c4fcdd..6953a637 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,7 @@
 ===== SVN trunk  =====
+07/06/2011
+- bugfix registerFilter() or registerPlugin() on template objects did register to the main Smarty object if the register methods had been used on the main Smarty object before.
+
 ===== Smarty 3.0.8  =====
 29/05/2011
 - bugfix <?xml ...> in templates did break "cache modified check"
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 7e3c4460..483ff222 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -724,8 +724,8 @@ class Smarty extends Smarty_Internal_Data {
     	// clear assigned tpl vars
     	$this->tpl_vars = array();
     	// clear objects for external methods
-    	unset($this->register);
-    	unset($this->filter);
+    	unset($this->Register);
+    	unset($this->Filter);
 	}