Fix for possible unit tests failure