Issue #137: cherry-pick fix