Fix Pausing issue while saving