addressed comments from PR #883