diff --git a/code/libraries/koowa/template/abstract.php b/code/libraries/koowa/template/abstract.php
index <HASH>..<HASH> 100644
--- a/code/libraries/koowa/template/abstract.php
+++ b/code/libraries/koowa/template/abstract.php
@@ -206,8 +206,7 @@ abstract class KTemplateAbstract extends KObject implements KObjectIdentifiable
 	 */
 	public function filter($data, $mode = KTemplateFilter::MODE_READ)
 	{	
-        $context = $this->getCommandChain()->getContext();
-		$context->caller 	= $this;
+        $context = $this->getCommandContext();
 		$context->data	  	= $data;
 				
         $result = $this->getCommandChain()->run($mode, $context);
Changed $this->getCommandChain()->getContext() to $this->getCommandContext(). We no longer need to add the caller variable to the context manually.