Implemented 1 missing change from discussion of pull request