Fix issue #1 close templating