Try a possible fix for broken unit test.