Template fix, part 2