Bug fix in the template