Fix variable name in template
Merge branch 'hotfix'