Fix self.where