Added fix to template as completed by Grant Jackson