Fixed the template -- finally!