Addressing comments from PR #481