Lightly tested on qemu VM, seems working OK

-- 
Vincent Legoll