Included fix from pull request comments.