Fixing semantics of listeners hash
Merge pull request #2740 from lowkaseo/listeners-rename

Fixing semantics of listeners hash