fix templates with stuff-2