Fix header retrieval