Fixed listener call issue spotted by @scrawl
Merge remote-tracking branch 'corristo/patch-1'