Fixing use of template data.