Fix Cherry-Picking Mold