Fixed generated template