> Patch is attached.

Here's a corrected patch. (Fixed another test failure.)