improve failover