simpler replication fix