Fix for failing unit test