Additional fix found by unit test failure