Fixing autosave / session issue