Fixed to use self.header