updated for pull request 184