fixed saveNext()