manually merge PR #426