make api-client work well