Follow up on PR #1343
Follow up on PR #1343