fix c2c replication issues