BUGFIX: Use the new template helper