Hopefully fix the intermittent Unit Test failure.