diff --git a/change_log.txt b/change_log.txt
index 0cd63aa5..6ef2b7da 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,8 @@
  ===== 3.1.30-dev ===== (xx.xx.xx)
+ 19.02.2016
+  - revert output buffer flushing on display, echo content again because possible problems when PHP files had 
+    characters (newline} after ?> at file end https://github.com/smarty-php/smarty/issues/187
+
  14.02.2016
   - new tag {make_nocache} read NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/110
   - optimization of sub-template processing
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 2c5ef21b..b1f7a03c 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.30-dev/44';
+    const SMARTY_VERSION = '3.1.30-dev/45';
 
     /**
      * define variable scopes
diff --git a/libs/sysplugins/smarty_internal_template.php b/libs/sysplugins/smarty_internal_template.php
index 9135d59a..7a85bf08 100644
--- a/libs/sysplugins/smarty_internal_template.php
+++ b/libs/sysplugins/smarty_internal_template.php
@@ -180,8 +180,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
                 ) {
                     echo $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
                 } else {
-                    ob_end_flush();
-                    flush();
+                    echo ob_get_clean();
                 }
             }
             if ($this->smarty->debugging) {