fix templates overrides