continue fix bugs in replication