Update templates with the fix