Follow up on review for PR #98
Follow up on review for PR #98