Fix for Bug 6420 with test.