Applied new header fix