Thomas,

Could you please test this patch and tell me if it breaks something?

Regards,

-- Nicolas