Serverlist fix