apply PR #128