Final fix for the server list