Merge pull request #386 from wcwang/ivi

[NFC] Fixed the listener issue.