Fix intermittent UT failure
Merge pull request #1142 from DonLakeFlyer/UTFailure

Fix intermittent UT failure