ticket:5 another hotfix with templates