Update following pull request