[D236] Bug 865 fixed

Bug 865 fixed for loosing template name.