issue 1947 (replication ) fix