Added changed to fix replication