fixing issues with ReplicaNotAvailable