Perhaps fixing this strange issue
Merge branch 'hotfix/templatebug'