Use new template on first pass too.