robustness fixes