Consistency changes for pull request #3