Patch attached.

Please review, thanks.