bug #1617 templates