Enhance failsafe condition