Fix regression in automatic saving