address comments from the PR #45