Hello,

I have a work-in-progress patch to improve things in this area that I'm
testing, please find attached.

-- 
Sean Whitton