Adjust pull request #80