Hi guys,
I didn't work too much on this 'area', but I think that I have a fix for this issue, check my patch.
Do not trow at me with stones if I am wrong 😝!