more header fixing2