Fixed the default template generation