#issue 146 - initial fix High-Replication Datastore problem