Jacked up the templating again, derf. Fixed?