Fix obtention of original headers