Fix intermittent UT failure

This fixed Issue #1133