This patch is a bit more viable that the previous one I think.

Mathieu