[2.3.8] possible replication issue