fix cherrypick error