Really fix the template