fixed the issue in the templates