Replicator fix