Bugfix: template