Fix oversave issue