Backported PR #173