fix and robustness