Improved failsafe