fix for self.state conflict