minor improvement on robustness