Sorry, attached wrong version of the patch.

Here is the right one