failsafe-ish added