updated for PR #169