Solved auto-save problem