fix replication by separating