Fix for failsafe detection