Rereading my own code,
same patch but with coding rules fixes :-)

Fabien