little more robustness