Template tweak (not again!)