Fixed merging of extra headers