Tkt 1491: Templates not working