Bugfix. Use new method in template.