Replicator fix #2