Improve robustness
fix