Fix regression in templates introduced with #60