Added a fix for the failing unit test.