Hi Nicolas!

Regarding the previous xfe patch, it looks like there are couple more
things to be patched. I have generated this patch for that. Would you be
able to push it please?

Thank you!

Regards,
RG.