fixed template overrides