Fix auto save problom on Data screen