OK, I will update my patch after your pull request merged and use it.