issue #268 - fix autosaves - needs testing still