I have no time to pursue now. I vote to merge and open a new PR asap to
improve. ok?