improved robustness of client