bug #1600 - added template