Fix pull request 4