Fixed issuse with autosave