diff --git a/change_log.txt b/change_log.txt
index 9ceaeae3..45c6c21a 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,6 +1,7 @@
  ===== 3.1.21-dev ===== (xx.xx.2014)
  12.10.2014
  - bugfix a comment like "<script{*foo*} language=php>" bypassed $php_handling checking (Thue Kristensen)
+ - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
 
  ===== 3.1.20 ===== (09.10.2014)
  08.10.2014
diff --git a/libs/sysplugins/smarty_internal_templatelexer.php b/libs/sysplugins/smarty_internal_templatelexer.php
index f39a3201..71cc2265 100644
--- a/libs/sysplugins/smarty_internal_templatelexer.php
+++ b/libs/sysplugins/smarty_internal_templatelexer.php
@@ -339,7 +339,7 @@ class Smarty_Internal_Templatelexer
     function yy_r1_14($yy_subpatterns)
     {
 
-        if (in_array($this->value, Array('<?', '<?=', '<?php')) || $script = strpos($this->value, '<s') === 0) {
+        if ($script = strpos($this->value, '<s') === 0 || in_array($this->value, Array('<?', '<?=', '<?php'))) {
             if ($script) {
                 $this->is_phpScript = true;
             }
@@ -1068,7 +1068,7 @@ class Smarty_Internal_Templatelexer
     function yy_r3_3($yy_subpatterns)
     {
 
-        if (in_array($this->value, Array('<?', '<?=', '<?php')) || $script = strpos($this->value, '<s') === 0) {
+        if ($script = strpos($this->value, '<s') === 0 || in_array($this->value, Array('<?', '<?=', '<?php'))) {
             if ($script) {
                 $this->is_phpScript = true;
             }
diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php
index 59c2356e..2c2c2b3b 100644
--- a/libs/sysplugins/smarty_internal_templateparser.php
+++ b/libs/sysplugins/smarty_internal_templateparser.php
@@ -4444,13 +4444,14 @@ class Smarty_Internal_Templateparser#line 80 "smarty_internal_templateparser.php
         while ($this->yyidx >= 0) {
             $stack = $this->yy_pop_parser_stack();
         }
-        #line 76 "smarty_internal_templateparser.y"
+        #line 75 "smarty_internal_templateparser.y"
 
         $this->successful = !$this->internalError;
         $this->internalError = false;
         $this->retvalue = $this->_retvalue;
         //echo $this->retvalue."\n\n";
-        #line 3165 "smarty_internal_templateparser.php"
+
+        #line 3166 "smarty_internal_templateparser.php"
     }
 
     public function doParse($yymajor, $yytokenvalue)