Network Listener fix