Replication fix