Fix header issue