Was this wrong before? Is there any test case exercising this?