Fixing Server Listener