Fix doc
Improve robustness