Fixing the template