Robustness part 1

This should make more robust.