Fix regression in templates introduced with #60
Merge pull request #61 from hbz/template-fix

Fix regression in templates introduced with #60