Fix self.query