Failsafe proxy fix