a little more robustness!