diff --git a/change_log.txt b/change_log.txt
index 7eb58320..6e7ae7d1 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,7 +1,10 @@
  ===== 3.1.20-dev ===== (xx.xx.2014)
+ 04.07.2014
+ - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
+ 
  ===== 3.1.19 ===== (06.30.2014)
  20.06.2014
- - bugfix template variables could not be passed as paramter in {include} when the include was in a {nocache} section (topic 25131)
+ - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
  
  17.06.2014
  - bugfix large template text of some charsets could cause parsing errors (topic 24630)
diff --git a/libs/sysplugins/smarty_internal_resource_extends.php b/libs/sysplugins/smarty_internal_resource_extends.php
index 2079f2bc..c78dba51 100644
--- a/libs/sysplugins/smarty_internal_resource_extends.php
+++ b/libs/sysplugins/smarty_internal_resource_extends.php
@@ -44,14 +44,14 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
                 throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
             }
             $sources[$s->uid] = $s;
-            $uid .= $s->filepath;
+            $uid .= realpath($s->filepath);
             if ($_template && $_template->smarty->compile_check) {
                 $exists = $exists && $s->exists;
             }
         }
         $source->components = $sources;
         $source->filepath = $s->filepath;
-        $source->uid = sha1(realpath($uid));
+        $source->uid = sha1($uid);
         if ($_template && $_template->smarty->compile_check) {
             $source->timestamp = $s->timestamp;
             $source->exists = $exists;