PRD-3815 - Fix Headers