Fix issues in listeners

No match.