Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

This is my modified patch (v6), fix the problems you stated. please review
again, thank!