cmd_server fix(3)