Hi Segher and Bill,

Thanks a lot for your review comments! I've updated the patch accordingly.

The updated one attached.