Fix for the unittest failure