Modified test case #581