fix variables in templates
fix variables in templates