fix RDBug 1891413
Merge pull request #1265 from yugangw-msft/bugfix

Fix RDBug 1891413