Patch to fix unit test.