minor changes for PR #23