Hi,

Here is another version that fixes all the "out of sync" counter that I
have… but maybe it start to grow outside the scope of this bug report.