Fixed PR #567 comments.