Address an issue around replication