Failsafe fix