Update to fix failing unit test