Fixing Server Listener.. yet again