Fix Save as draft after autosave issue