Fix issue with server failover