#20 Fixed bug in template