ammend to PR #126