Fixed the template problem