Fix for unittest failure