Fix comments from PR #6204.
Merge pull request #6208 from openscholar/6199-fix_comments

Fix comments from PR #6204.