Improve robustness of benchmark