Robust-ify a bit