fixed find_server