Patch attached.

-zefram