see PR #372