Hi Nicolas and Greg,

Thank you for applying my initial patch.

Inspired by Greg's improvements to my patch, I'd like to propose the attached (presumptuously named) better-patch that I believe fixes the TODO of my initial patch.

Sorry it isn't quite in the format of the previous one/recommended by the project but I'm not on my main machine now.

Best regards,
--
Philippe Crama