Modified failsafe (issue #112)