local edit.

hell, this is a pull request from master@75550412