fix art cherrypick