complete PR #98