Failover fix