cmd_server fix