Taking account remark on pull request da17302