Fixed replication issue