bug-fix in template