cmd_server fix(2)