Thanks Nicolas for taking time to have look at my patch.

I'm a attaching a second version of the patch. Please have another look.

-- Toon