Fix for a possible intermitten unit test failure