Fixed issue with template