I'm sending here the patch as you requested.
I hope that you will find it useful.

Sincerely,

Carlo Bramini.