Fix cli client.