Final header fix