More header fix