Improve o2o robustness