Cherry-pick fix