feedback from PR #60