I've attached the patch.

What do you think?