Fix comments in PR #1495