fix cmd_server (2)