Adding PendEdit fix from pull request 507.