more header fixing