[CLC-1177] Another attempt at fixing the replay error
Merge pull request #595 from yuhunglin/CLC-1177

[CLC-1177] Another attempt at fixing the replay error