Fix pull request 5