FS#2888 fix for templates