Add more robustness