possibly fixing self.match...