Fixed feedback from @xabbuh: Templates