Fixed listener call issue spotted by @scrawl