Fix for an intermittent unit test failure