Fix cornercases in Listener.Listen()