Fixing error caught by unit test!