Fix for a possible unit test failure