Update implementation of listen for v1.3.x
Merge pull request #1687 from mojombo/fix-listen

Fix implementation of listen for v1.3.x