improved robustness of server