Fix for unit test failure