cli "client mode" fix