Possible replication fix