The simplest and least intrusive way to fix this.
Merge pull request #340 from golddranks/template-fix

The simplest and least intrusive way to fix this.