Improve the robustness