improving robustness (and bug hunting)