Fix for possible unit test failure