more robustness in Main