fixed, except for templates