Replication issue 2.3.7