Fix header removal