Auto saver fixed