improved robustness of solver slightly