Fix for a race-ish condition in SubdomainReplicator