fixed template error
Merge branch 'updates'