Fix
Merge pull request #47 from thebirn/listener-bug

Fix