Fix #server so that it returns the right server instead of all servers