Fix PR #47