Address comments on pull request #448