Fix for Exiting While Saving