diff --git a/change_log.txt b/change_log.txt
index 9f3c2e8b..92bd438b 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,6 @@
  ===== 3.1.22-dev ===== (xx.xx.2014)
+ - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text
+ 
  ===== 3.1.21 ===== (18.10.2014)
  18.10.2014
   - composer moved to github
diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php
index 98b9fc7f..b172f908 100644
--- a/libs/sysplugins/smarty_internal_templateparser.php
+++ b/libs/sysplugins/smarty_internal_templateparser.php
@@ -3453,20 +3453,20 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
     function yy_r11()
     {
         if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-            $this->_retvalue = new _smarty_text($this, st);
+            $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
         } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
             $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
         } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
             if ($this->asp_tags) {
                 $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode('%>', true));
             } else {
-                $this->_retvalue = new _smarty_text($this, st);
+                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
             }
         } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
             if ($this->asp_tags) {
                 $this->_retvalue = null;
             } else {
-                $this->_retvalue = new _smarty_text($this, st);
+                $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
             }
         }
     }